Commit graph

48 commits

Author SHA1 Message Date
Gregor Müllegger
911dcb442a Moving create_extra_permissions to the more appropriate permissions module. 2013-06-06 10:29:10 +02:00
Daniel Greenfeld
9acdf9e2f8 fixes #155, which is moving models.py to types.py. Using admins.py as an alias for the old models.py module 2013-05-30 12:33:00 +02:00
Daniel Greenfeld
5fcccb6183 Remove print statement. Fixes #143 2013-05-29 12:17:08 +02:00
Gregor Müllegger
8c88362197 Removing old permission handling. 2013-05-29 10:44:22 +02:00
Gregor Müllegger
e7cadd5ab5 Allow ModelAdmin2 instances to have names. 2013-05-29 10:44:22 +02:00
Daniel Greenfeld
611b34fd64 Wrapped all calls to model._meta with model_options function. fix #134 2013-05-23 20:00:14 +02:00
Daniel Greenfeld
d8409a2070 For #134, this moves many independant functions to the utils module and begins conversion of naked ._meta use to using the utils.model_options wrapper 2013-05-23 19:46:03 +02:00
Daniel Greenfeld
5129541154 merge and adding requirements for floppy-forms 2013-05-23 19:23:23 +02:00
Daniel Greenfeld
a62d3aceff merge conflict resolutions 2013-05-23 13:01:27 +02:00
Gregor Müllegger
984b6fb8d4 Using own modelform_factory to produce forms that are using floppyforms widgets. That allows better customization in the frontend. 2013-05-22 19:29:51 +02:00
Daniel Greenfeld
af96990275 Move mixins to their own directory so the apiviews aren't directly importing from views 2013-05-22 18:40:53 +02:00
Peter Inglesby
ade92956d0 Handle actions by POSTing to ModelListView 2013-05-22 11:32:01 +01:00
Andrew Ingram
a1ce27d4c2 Improve the rendering of inline form sets 2013-05-22 01:06:25 +01:00
Andrew Ingram
c051b8807a Merge remote-tracking branch 'origin/develop' into inline-formsets 2013-05-21 00:11:28 +01:00
Daniel Greenfeld
baf573bf11 Added immutable admin object per #99 2013-05-20 18:45:59 +02:00
Daniel Greenfeld
b9ca57bd00 PEP-8 before working on #99 2013-05-20 18:04:51 +02:00
Daniel Greenfeld
999eb32d74 Adding warnings about refactoring 2013-05-20 00:50:41 +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
4d44d3e534 warnings in models 2013-05-19 17:19:18 +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
Gregor Müllegger
bc899a9389 Adding support for pagination. 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
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
dae15811ee Fixing urls. 2013-05-19 14:21:02 +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
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
Andrew Ingram
2e772ce8a3 Basic support for inline form sets 2013-05-19 11:21:25 +02:00
Daniel Greenfeld
403733e1d4 merge in @inglesp 2013-05-19 10:20:09 +02:00
Daniel Greenfeld
28b6a0f72a pep8 of code 2013-05-19 10:09:12 +02:00
Daniel Greenfeld
e963553361 merge in from @AndrewIngram for #58 2013-05-19 09:47:42 +02:00
Daniel Greenfeld
e48641cde9 Index work 2013-05-18 18:33:43 +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
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
d8a82edc27 Merge remote-tracking branch 'upstream/master' into permissions
Conflicts:
	djadmin2/models.py
2013-05-18 16:22:53 +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
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
Peter Inglesby
7c5e7e6883 Rename package to djadmin2 2013-05-18 11:52:03 +02:00
Renamed from admin2/models.py (Browse further)