Gregor Müllegger
0c7615b733
Implementing a class-based permission handling.
2013-05-29 10:43:09 +02:00
Andrew Ingram
9f41c3f56e
Initial stab at breadcrumbs
...
There's currently a lot of copy-pasting of breadcrumbs, this can be revisited once we have a better understanding of how we're going to handle navigation.
I've also tried to make template context variables more logical and consistent throughout.
2013-05-26 01:55:43 +01:00
Ben Tappin
30cacb7569
Use PK instead of ID in the model list view and template.
2013-05-24 12:06:35 +01:00
Daniel Greenfeld
0092325262
Used filters to present results of views better for #128
2013-05-23 20:11:04 +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
638ae91756
PEP-8 work
2013-05-23 19:30:15 +02:00
Daniel Greenfeld
a62d3aceff
merge conflict resolutions
2013-05-23 13:01:27 +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
05f69775b2
Merge remote-tracking branch 'origin/develop' into inline-formsets
...
Conflicts:
djadmin2/templates/admin2/bootstrap/model_add_form.html
djadmin2/templates/admin2/bootstrap/model_edit_form.html
djadmin2/views.py
2013-05-22 00:58:53 +01:00
Audrey Roy
b79523c659
Refactor duplicate model add/edit forms.
2013-05-21 15:45:08 -07:00
Daniel Greenfeld
5836a1cb97
Merge branch 'develop' of https://github.com/twoscoops/django-admin2 into develop
2013-05-22 00:38:24 +02:00
Daniel Greenfeld
192229e513
Fix admin2_tags templatetag reference that was bad
2013-05-22 00:37:14 +02:00
Audrey Roy
16ceca0dfe
Model edit form now reuses save logic
2013-05-21 23:50:50 +02:00
Daniel Greenfeld
ce835ffc79
Merge branch 'feature/save-options' of git://github.com/chrislawlor/django-admin2 into chrislawlor-feature/save-options
2013-05-21 23:18:53 +02:00
Chris Lawlor
f66ffe8c86
Use admin2_url, redirect create form to index view.
...
Uses the template tag admin2_url to create namespaced view names
from inside of views.
Create model form now redirects to the model index page, as
django.contrib.admin. does.
Removed get_success_url from ModelListView, as generic.ListView
does not call this method.
2013-05-21 14:01:30 -04:00
Andrew Ingram
c051b8807a
Merge remote-tracking branch 'origin/develop' into inline-formsets
2013-05-21 00:11:28 +01:00
Daniel Greenfeld
21a4f94359
Merge pull request #115 from chrislawlor/feature/template-context-refactor
...
Adds model name to AdminModel2Mixin template context.
2013-05-20 10:38:19 -07:00
Chris Lawlor
3d2b347063
Adds model name to AdminModel2Mixin template context.
...
All views subclassing AdminModel2Mixin will need the model
name in their template context, so moving it to the base
class so child views don't all have to override
get_context_data.
2013-05-20 10:34:35 -04:00
Chris Lawlor
32f5e4802f
Adds page title to model create page
2013-05-20 09:07:19 -04:00
Chris Lawlor
c6c44bbdd0
Implements model save options, issue #110
2013-05-20 08:45:34 -04: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
Audrey Roy
b19b477888
Edit form improvement - part of #72
2013-05-19 17:13:20 +02: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
Raphael Kimmig
603db79ca1
rename modeladmin to model_admin fixes #91
2013-05-19 15:16:21 +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
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
28b6a0f72a
pep8 of code
2013-05-19 10:09:12 +02:00
Daniel Greenfeld
774b49ed9f
merge
2013-05-19 10:01:50 +02: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
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
63f5cbaa18
fixes modeladmin kwarg not working
2013-05-18 17:08:03 +02:00
Peter Inglesby
4bd0e90fd1
Refactor views to use new Admin2Mixin
2013-05-18 16:40:18 +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
Daniel Greenfeld
3b7f4d7fe8
Views cleanup during merge.
2013-05-18 15:26:47 +02:00
Raphael Kimmig
cf01b720e0
add initial views
2013-05-18 14:36:14 +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
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
