Danilo Bargen
39aaacccb6
PEP8
2013-07-06 09:37:25 +02:00
Daniel Greenfeld
b580ba7f41
work on prep for #220
2013-07-04 14:07:32 +02:00
d1ffuz0r
256efa679e
#154 changed fbc action views behavior to cbv. added breadcrumbs to actions with multiple items
2013-06-17 11:56:37 +07:00
Wade Austin
095bc1ad5d
Override get_queryset in ModelListView to preform a search if needed
...
Added a get_search_results method to ModelListView based on the logic from django.contrib.admin.views.main.ChangeList
Added search_fields and search_term to the extra context data
2013-06-06 13:00:03 -05:00
Daniel Greenfeld
87d38f0619
for #161 we now support both functions and classes for list actions
2013-06-04 20:18:45 +02:00
Daniel Greenfeld
1195f38b84
More work on admin
2013-05-31 17:38:34 +02:00
Daniel Greenfeld
0da6f453b7
For #161 , this removes the FBV and implements an easily extendible BaseListAction class
2013-05-31 16:47:25 +02:00
Daniel Greenfeld
1916f7cba4
Change list actions to be list_actions so their nature is more explicit
2013-05-31 15:37:55 +02:00
Daniel Greenfeld
bf1657990a
replace django.contrib.admin introduced in last pull request with our own native form
2013-05-31 08:49:24 +02:00
d1ffuz0r
db939ef753
fixed names
2013-05-31 08:25:45 +07:00
d1ffuz0r
8dd3cd4133
added tests
2013-05-31 08:21:43 +07:00
d1ffuz0r
b54c28afc1
deleted LoginRequiredMixin
2013-05-31 07:39:58 +07:00
d1ffuz0r
b8413f96e3
change password form dependent from user
2013-05-31 07:24:22 +07:00
d1ffuz0r
6c0978189a
login view
2013-05-31 06:20:39 +07:00
d1ffuz0r
17bc5acecf
use django-braces for login required views
2013-05-31 06:20:15 +07:00
d1ffuz0r
8ae0644fb9
#101 #103 added change password, logout views
2013-05-31 06:19:33 +07:00
Ben Tappin
f4f400734c
Use utils.model_options() in views and change utils import.
2013-05-29 14:09:26 +01:00
Ben Tappin
11f193ffc9
UI improvements when deleting objects.
...
Shows nested child objects that will be deleted when deleting a single object or multiple objects.
Includes some hacky tests for NestedObjects in the example app.
2013-05-29 12:38:32 +01:00
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