Hopiu/django-admin2
1
0
Fork 0
mirror of https://github.com/jazzband/django-admin2.git synced 2026-04-02 06:10:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
531 commits 3 branches 11 tags 3.7 MiB
Commit graph

261 commits

Author SHA1 Message Date
Ludvig Wadenstein
36491b4894 Replaced change password and logout links with dropdown 2013-05-19 20:46:14 +02:00
Andrew Ingram
c625a80eaa Merge remote-tracking branch 'origin/master' into inline-formsets 
Conflicts:
	djadmin2/templates/admin2/bootstrap/model_edit_form.html
 2013-05-19 19:17:51 +01:00
Daniel Greenfeld
234d2a9a6f Prep for version 0.2.0 2013-05-19 17:23:58 +02:00
Daniel Greenfeld
6a351eb466 Merge pull request #104 from audreyr/edit-form-enhancements-72 
Edit form improvement - part of #72
 2013-05-19 08:18:57 -07:00
Daniel Greenfeld
4d44d3e534 warnings in models 2013-05-19 17:19:18 +02:00
Audrey Roy
b19b477888 Edit form improvement - part of #72 2013-05-19 17:13:20 +02:00
Daniel Greenfeld
0859342ae4 Merge pull request #97 from RaphaelKimmig/rename-modeladmin-model_admin 
rename modeladmin to model_admin fixes #91
 2013-05-19 07:30:40 -07:00
Raphael Kimmig
973ec97b2e Merge remote-tracking branch 'upstream/master' into rename-modeladmin-model_admin 
Conflicts:
	djadmin2/core.py
	djadmin2/templates/admin2/bootstrap/index.html
	djadmin2/views.py
 2013-05-19 15:45:24 +02:00
Gregor Müllegger
e745291445 Fixing issue that permissions cannot be hyperlinked from users and group API resource. 2013-05-19 15:32:51 +02:00
Raphael Kimmig
603db79ca1 rename modeladmin to model_admin fixes #91 2013-05-19 15:16:21 +02:00
Daniel Greenfeld
4f5eb65d5c Merge pull request #92 from ludw/modellistui 
Modellist UI cleaned up, #78
 2013-05-19 06:05:57 -07:00
Daniel Greenfeld
0c1238dff6 Merge pull request #90 from gregmuellegger/rest-api-integration 
Rest api integration
 2013-05-19 05:48:51 -07:00
Daniel Greenfeld
7597e045a3 fix a merge mistake by yours truly. 2013-05-19 14:46:35 +02:00
Daniel Greenfeld
b4d4a6bde7 merge of @RaphaelKimmig's work 2013-05-19 14:44:27 +02:00
Daniel Greenfeld
594d6f9b27 Documentation and cleanup of core 2013-05-19 14:38:27 +02:00
Ludvig Wadenstein
bff0269729 Replaced edit detail delete with just a link to edit 2013-05-19 14:32:58 +02:00
Ludvig Wadenstein
ed9f1c3b69 More style changes on model list 2013-05-19 14:29:29 +02:00
Daniel Greenfeld
0e63bc8e7e Merge branch 'master' of github.com:pydanny/django-admin2 2013-05-19 14:26:54 +02:00
Gregor Müllegger
cd625a6046 Fixing a bug that was introduced during rebasing. 2013-05-19 14:26:10 +02:00
Daniel Greenfeld
539dac9957 remove unnecessary exceptions file 2013-05-19 14:26:03 +02:00
Gregor Müllegger
dc0ecdfe0c Adding a link to the API from the admin frontend. 2013-05-19 14:23:19 +02:00
Gregor Müllegger
0da7584e99 We don't need detail pages for apps in the API. 2013-05-19 14:23:18 +02:00
Gregor Müllegger
fe140bbf39 Integrating the new app registry so that the API can generate a nice index page. 2013-05-19 14:23:18 +02:00
Gregor Müllegger
4e03b7ce16 Fixing called function for API index view kwargs. 2013-05-19 14:23:18 +02:00
Gregor Müllegger
bc899a9389 Adding support for pagination. 2013-05-19 14:23:18 +02:00
Gregor Müllegger
8ea3b97786 Using django's TestCase and instead of the one from unittest. 2013-05-19 14:23:18 +02:00
Gregor Müllegger
631727d0f0 Tests for the API index view. 2013-05-19 14:23:18 +02:00
Gregor Müllegger
09dd2095e3 Fixing names for views beeing more consistent and tests for API views. 2013-05-19 14:22:50 +02:00
Gregor Müllegger
73a41f5632 Fixing tests for API. 2013-05-19 14:22:18 +02:00
Gregor Müllegger
68d6b96f84 Adding an index resource for the API. 2013-05-19 14:21:57 +02:00
Gregor Müllegger
a16faccade Hyperlinking the API. 2013-05-19 14:21:21 +02:00
Gregor Müllegger
c7014282dc Renaming 'api-index' view to 'api-list' makes more sense, since the index will be a list of all available models. 2013-05-19 14:21:21 +02:00
Gregor Müllegger
58e5f7b54c Using admin views mixin for API views. 2013-05-19 14:21:03 +02:00
Gregor Müllegger
dae15811ee Fixing urls. 2013-05-19 14:21:02 +02:00
Gregor Müllegger
0e559347d3 Versioning the API. 2013-05-19 14:20:18 +02:00
Gregor Müllegger
8e2aebcc09 Renaming a few things to make more sense and to stick to conventions. 2013-05-19 14:19:57 +02:00
Gregor Müllegger
d5330e14f6 Adding a detail based view. 2013-05-19 14:19:57 +02:00
Gregor Müllegger
f0c86f10b1 Adding first prototype of a List/Create API view. 2013-05-19 14:19:28 +02:00
Gregor Müllegger
7754cae894 Fixing tests for API urls. 2013-05-19 14:17:06 +02:00
Gregor Müllegger
9db48cf0d9 Adding a detail based view. 2013-05-19 14:17:06 +02:00
Gregor Müllegger
2ad1fce536 Adding first prototype of a List/Create API view. 2013-05-19 14:16:15 +02:00
Ludvig Wadenstein
c543c57f15 Merge remote-tracking branch 'upstream/master' into modellistui 2013-05-19 14:10:51 +02:00
Audrey Roy
e50f26947b Change model from index. Stub for Add. Close #81. 2013-05-19 14:06:27 +02:00
Raphael Kimmig
56135460ea fix add links on index page 2013-05-19 13:47:51 +02:00
Audrey Roy
547fb77c24 Stub out more UI parts for #81 2013-05-19 13:29:28 +02:00
Ludvig Wadenstein
e0151c28a4 Changed the modellist action bar around a bit 2013-05-19 13:14:07 +02:00
Andrew Ingram
0ebedc8dfd Merge remote-tracking branch 'origin/master' into inline-formsets 2013-05-19 13:11:01 +02:00
Audrey Roy
1231048281 Better index view. First part of #81 2013-05-19 13:03:25 +02:00
Daniel Greenfeld
5fee2dd76b Merge branch 'master' of github.com:pydanny/django-admin2 2013-05-19 12:10:20 +02:00
Daniel Greenfeld
25f3e598f3 Added self.apps in the registration method of core.Admin2 #81 2013-05-19 12:09:12 +02:00
Andrew Ingram
2e772ce8a3 Basic support for inline form sets 2013-05-19 11:21:25 +02:00
Peter Inglesby
36b502f7c7 Remove spurious print statement 2013-05-19 10:39:32 +02:00
Daniel Greenfeld
950b68bd75 version bump 2013-05-19 10:28:37 +02:00
Daniel Greenfeld
403733e1d4 merge in @inglesp 2013-05-19 10:20:09 +02:00
Daniel Greenfeld
aecb2ba879 Docs and mixins cleanup 2013-05-19 10:15:50 +02:00
Daniel Greenfeld
28b6a0f72a pep8 of code 2013-05-19 10:09:12 +02:00
Daniel Greenfeld
a076cca859 Merge pull request #64 from audreyr/list-view-frontend-work 
List view frontend work
 2013-05-19 01:03:51 -07:00
Daniel Greenfeld
701304224e Merge branch 'master' of github.com:pydanny/django-admin2 2013-05-19 10:02:17 +02:00
Daniel Greenfeld
774b49ed9f merge 2013-05-19 10:01:50 +02:00
Daniel Greenfeld
0fd10cdbb9 Merge pull request #66 from RaphaelKimmig/add-admin2-core-documentation 
add some docstrings to core.Admin2
 2013-05-19 00:58:44 -07:00
Daniel Greenfeld
29fc882c4b merge from @rivo 2013-05-19 09:53:37 +02:00
Daniel Greenfeld
e963553361 merge in from @AndrewIngram for #58 2013-05-19 09:47:42 +02:00
Audrey Roy
3722523f0d Merge remote-tracking branch 'upstream/master' into list-view-frontend-work 2013-05-19 09:38:37 +02:00
Raphael Kimmig
1818cbe553 fix typos in core docstrings 2013-05-18 23:32:17 +02:00
Raphael Kimmig
684b167d11 Add missing word to Admin2 docstring. 2013-05-18 22:40:35 +02:00
Raphael Kimmig
a45f586e7f add some docstrings to core.Admin2 2013-05-18 21:45:43 +02:00
Audrey Roy
9e647ae4ee More of #61 2013-05-18 18:37:20 +02:00
Daniel Greenfeld
6c1a0646fc Merge branch 'admin-core-tests' of git://github.com/inglesp/django-admin2 into inglesp-admin-core-tests 2013-05-18 18:34:31 +02:00
Daniel Greenfeld
e48641cde9 Index work 2013-05-18 18:33:43 +02:00
Peter Inglesby
5223c188c3 Add tests to core 2013-05-18 18:28:31 +02:00
Audrey Roy
0938f570c1 Display model count/name at bottom 2013-05-18 18:25:36 +02:00
Audrey Roy
74c86f9c3b Partial checkin of #61 2013-05-18 18:16:25 +02:00
Daniel Greenfeld
55673a8649 Merge 2013-05-18 18:04:40 +02:00
Audrey Roy
a99952375c Display model name in template 2013-05-18 17:52:53 +02:00
Rivo Laks
bea52a38df Merge remote-tracking branch 'upstream/master' into permissions 
Some cleanup as well.
 2013-05-18 17:50:07 +02:00
Rivo Laks
e7861323ca Integrate permissions into views 
Views now ensure that the user has corresponding permissions.
Also, action buttons, e.g. Add, are shown only when the user can actually do that.
 2013-05-18 17:44:56 +02:00
Andrew Ingram
6cbf712548 Fix the errors caused by me deleting utils.py 
I'm a bad person.
 2013-05-18 17:20:49 +02:00
Andrew Ingram
4c021c4979 remove some lines that are currently unused 2013-05-18 17:09:44 +02:00
Andrew Ingram
63f5cbaa18 fixes modeladmin kwarg not working 2013-05-18 17:08:03 +02:00
Andrew Ingram
1fad491359 Merge remote-tracking branch 'origin/master' into custom-form-classes 2013-05-18 17:05:20 +02:00
Andrew Ingram
24bfdab8a6 custom form class support 
Also sets framework for adding kwargs to any admin2 view
 2013-05-18 16:59:06 +02:00
Rivo Laks
779c0f3d25 Merge remote-tracking branch 'upstream/master' into permissions 2013-05-18 16:58:51 +02:00
Daniel Greenfeld
705110d20a Merge pull request #52 from audreyr/template-fixes 
Fix incorrect templates being extended.
 2013-05-18 07:57:28 -07:00
Audrey Roy
e3836ca986 Fix incorrect template being extended. 2013-05-18 16:53:17 +02:00
Peter Inglesby
4bd0e90fd1 Refactor views to use new Admin2Mixin 2013-05-18 16:40:18 +02:00
Rivo Laks
d8a82edc27 Merge remote-tracking branch 'upstream/master' into permissions 
Conflicts:
	djadmin2/models.py
 2013-05-18 16:22:53 +02:00
Daniel Greenfeld
674b75042b Merge pull request #48 from AndrewIngram/registry 
Registry
 2013-05-18 07:17:19 -07:00
Andrew Ingram
8f64972fd5 Add missing newlines at end of files 2013-05-18 16:10:17 +02:00
Andrew Ingram
0a310f3830 Reformat modeladmin urls 2013-05-18 15:57:42 +02:00
Andrew Ingram
88418efc7b Added django admin style registration (for now) 
Big changes to how things are structured, ModelAdmin2 handles its views and urls
 2013-05-18 15:43:44 +02:00
Ludvig Wadenstein
30e6a5b171 Fixed importissue with tests 2013-05-18 15:30:32 +02:00
Daniel Greenfeld
3b7f4d7fe8 Views cleanup during merge. 2013-05-18 15:26:47 +02:00
Rivo Laks
e29767a208 Create view permissions for all models when syncdb is run 
Works exactly the same way as that of the standard add/change/delete permissions
(the code is in fact copied from there).
 2013-05-18 15:09:14 +02:00
Rivo Laks
c4dbe6f735 Implement proper permission checkin in Admin2 
Uses Django's builtin per-model permissions (add/change/delete plus view which we'll add)
and also supports per-object permissions.
 2013-05-18 15:07:34 +02:00
Raphael Kimmig
cf01b720e0 add initial views 2013-05-18 14:36:14 +02:00
Daniel Greenfeld
e59857d955 Merge pull request #39 from audreyr/master 
Now using the Bootstrap theme stub as per #9
 2013-05-18 05:00:45 -07:00
Audrey Roy
9f435fc595 Getting admin2 to use the bootstrap theme properly. 2013-05-18 13:57:22 +02:00
Daniel Greenfeld
5e7c9df2e0 Merge pull request #38 from audreyr/master 
Give unicode methods to models in example project
 2013-05-18 04:51:32 -07:00
Daniel Greenfeld
bbfc8ebe36 Design documenting 2013-05-18 13:45:31 +02:00
Audrey Roy
6d59986241 Stub out templates for #9 2013-05-18 13:37:46 +02:00
Audrey Roy
c464645cc3 Enabled admin at admin/ in example. Put admin2 at admin2/. 2013-05-18 13:17:15 +02:00
Daniel Greenfeld
44ae271a2e Merge branch 'master' of github.com:pydanny/django-admin2 2013-05-18 12:57:11 +02:00
Daniel Greenfeld
7773816c07 getting the views to work 2013-05-18 12:57:01 +02:00
Audrey Roy
4b21cc701c Breakout index/base templates 2013-05-18 12:49:08 +02:00
Audrey Roy
2179d3e338 Merge remote-tracking branch 'upstream/master' 2013-05-18 12:24:30 +02:00
Rivo Laks
3247380382 Don't import url patterns from deprecated module 2013-05-18 12:19:47 +02:00
Audrey Roy
100d475e26 Merge remote-tracking branch 'upstream/master' 2013-05-18 12:13:13 +02:00
Audrey Roy
4885b27110 Add Bootstrap theme files. 2013-05-18 12:10:10 +02:00
Rivo Laks
04be286884 Fix the admin2 -> djadmin2 package rename 2013-05-18 12:07:27 +02:00
Daniel Greenfeld
62abced904 Merge branch 'issue2' of git://github.com/inglesp/django-admin2 into inglesp-issue2 2013-05-18 11:56:16 +02:00
Peter Inglesby
7c5e7e6883 Rename package to djadmin2 2013-05-18 11:52:03 +02:00