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

159 commits

Author SHA1 Message Date
Daniel Greenfeld
0236a5cc07 small correction on model naming 2013-05-23 22:34:15 +02:00
Daniel Greenfeld
a3eea0aaf9 Merge branch 'bugfix/delete-action-message-display' of git://github.com/chrislawlor/django-admin2 into chrislawlor-bugfix/delete-action-message-display 2013-05-23 22:30:24 +02:00
Daniel Greenfeld
dca4d849d7 Merge branch 'floppify-auth-forms' of git://github.com/gregmuellegger/django-admin2 into gregmuellegger-floppify-auth-forms 2013-05-23 22:25:16 +02:00
Chris Lawlor
396f49665e Fixes message display after action handling. 
Calls unicode to force encoding of object name to a localized
unicode string. Also fixes deleted object count by saving
len(queryset) to a local var before calling queryset.delete(), as
the len after queryset.delete() is always zero.
 2013-05-23 15:37:50 -04:00
Gregor Müllegger
d10838c2ed Don't copy input_type attribute from original widget when the floppyform widget has a much more appropriate HTML5 type. 2013-05-23 20:59:35 +02:00
Daniel Greenfeld
5f1f91167f test cleanup 2013-05-23 20:22:44 +02: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
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
638ae91756 PEP-8 work 2013-05-23 19:30:15 +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
77fa844184 Also take form field into account when floppifying widgets. That way all specific floppyform widgets will be used for modelforms (like EmailInput, NumberInput, etc.). 2013-05-22 22:16:03 +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
Gregor Müllegger
188c12d647 Implementing a modelform_factory that takes care of converting all widgets on the modelform to floppyform widgets if possible. 2013-05-22 19:29:12 +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
Daniel Greenfeld
cd82aad51b Merge pull request #132 from audreyr/cruft-cleanup 
Remove unused Admin2Form class.
 2013-05-22 09:01:10 -07:00
Peter Inglesby
ade92956d0 Handle actions by POSTing to ModelListView 2013-05-22 11:32:01 +01:00
Peter Inglesby
79e6dfad83 Add delete_selected action 2013-05-22 11:32:01 +01:00
Peter Inglesby
8b6b56a1a8 Add messages to base.html 2013-05-22 11:32:01 +01:00
Peter Inglesby
88c0ce4e9f Remove stray closing tag. 2013-05-22 11:32:01 +01:00
Audrey Roy
0d6ab93b84 Remove unused Admin2Form class. 2013-05-22 10:38:23 +02: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
Andrew Ingram
262c759604 Merge remote-tracking branch 'origin/develop' into rename-templatetag-module 2013-05-21 00:05:25 +01:00
Andrew Ingram
3dcaeb4023 rename admin2_urls to admin2_tags 2013-05-20 23:45:22 +01:00
Daniel Greenfeld
0e03d7a5b0 bike shedding 2013-05-21 00:25:38 +02:00
Audrey Roy
55168a0ea0 Fix delete text to match original admin. 2013-05-20 23:33:37 +02:00
Chris Lawlor
f9a1540e09 Add 'title' and 'page_title' template blocks. 
Makes template page title styling consistent across all templates.
 2013-05-20 16:17:44 -04: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
Daniel Greenfeld
2b4449a769 Merge pull request #117 from chrislawlor/feature/model-create-page-title 
Adds page title to model create page
 2013-05-20 10:37:47 -07:00
Daniel Greenfeld
baf573bf11 Added immutable admin object per #99 2013-05-20 18:45:59 +02:00
Daniel Greenfeld
4f08ea2165 PEP-8 before working on #99 2013-05-20 18:09:58 +02:00
Daniel Greenfeld
b9ca57bd00 PEP-8 before working on #99 2013-05-20 18:04:51 +02: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
Daniel Greenfeld
999eb32d74 Adding warnings about refactoring 2013-05-20 00:50:41 +02:00
Daniel Greenfeld
a2f73e0fb5 Merge pull request #108 from ludw/headerui 
Header UI style
 2013-05-19 15:46:32 -07:00
Daniel Greenfeld
83eb8da62a Merge pull request #107 from ludw/master 
Fixed small issue in modellistview
 2013-05-19 15:45:57 -07:00
Ludvig Wadenstein
7c08296772 Fixed bug with modellist if more than one item 2013-05-19 20:56:41 +02:00
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