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

482 commits

Author SHA1 Message Date
Daniel Greenfeld
a909ab1517 Merge of #308 2013-07-08 19:08:18 +02:00
Daniel Greenfeld
2ec6441de3 Merge pull request #309 from dbrgn/actions_on_top_bottom 
Implemented actions_on_top and actions_on_bottom
 2013-07-08 09:58:12 -07:00
Danilo Bargen
f178f2fccd Compiled messages for German and Slovak 2013-07-08 16:16:02 +02:00
Danilo Bargen
ec0300fa32 Added translated locales for Slovak 2013-07-08 10:57:39 +02:00
Danilo Bargen
18fda874b0 Added translated locales for German 2013-07-08 10:54:32 +02:00
Eleonore9
3ca4fa394f for #308 this styles the save_on_top 2013-07-07 18:19:33 +02:00
bootandy
06c2e81392 allow sort by field 2013-07-07 16:48:21 +02:00
Danilo Bargen
4977f269b5 Implemented actions_on_top and actions_on_bottom (fixes #267, #268) 2013-07-07 16:46:59 +02:00
Daniel Greenfeld
47df410c07 merge 2013-07-07 16:13:48 +02:00
Daniel Greenfeld
e2f6bb859e Add page_title link 2013-07-07 15:50:55 +02:00
Daniel Greenfeld
0052cd3a9a Change the save_on_bottom on the top of the update form to be save_on_top 2013-07-07 15:45:27 +02:00
Daniel Greenfeld
7b8b9afa96 merge 2013-07-07 15:39:59 +02:00
Danilo Bargen
b2f4290bf2 Documentation 2013-07-07 15:08:42 +02:00
Danilo Bargen
2a8bab0170 Added renderer tests 2013-07-07 15:08:41 +02:00
Danilo Bargen
1b7382526f Automatically choose best renderer by default 2013-07-07 15:08:07 +02:00
Danilo Bargen
835992b8d0 Added number renderer 2013-07-07 15:08:07 +02:00
Danilo Bargen
5cd153736d Moved get_attr filter to utils 2013-07-07 15:08:07 +02:00
Danilo Bargen
121f5b8564 First renderer implementation 2013-07-07 15:07:06 +02:00
Danilo Bargen
2f22eecc1b Converted get_attr tag to filter 2013-07-07 15:07:06 +02:00
Daniel Greenfeld
506f58f705 This is DJANGO-ADMIN! fix #300 2013-07-07 14:19:23 +02:00
Daniel Greenfeld
35b1125429 fix #293 2013-07-07 12:10:50 +02:00
Daniel Greenfeld
a9c2d1d198 improved filter form styling 2013-07-07 11:59:45 +02:00
Daniel Greenfeld
4d5b170e10 merge 2013-07-07 11:48:56 +02:00
bootandy
e57f821ce1 fix string filters 2013-07-07 11:34:06 +02:00
NotSqrt
40052d671d regenerate locales after change on buttons 2013-07-07 11:02:54 +02:00
NotSqrt
c132a7cdd0 more details on i18n 2013-07-07 11:00:49 +02:00
NotSqrt
8935395534 work on i18n : add comments for translators, french translation to check the result 2013-07-07 11:00:49 +02:00
Daniel Greenfeld
876cc2c723 for #268, this adds actions_on_bottom for the default view 2013-07-07 10:58:35 +02:00
Daniel Greenfeld
e66175ed21 Remove django-admin2 from the dashboard if it's not been activated 2013-07-07 10:42:55 +02:00
Daniel Greenfeld
038313c81c merge 2013-07-06 18:33:44 +02:00
Daniel Greenfeld
4908a9675e Merge branch 'develop' of github.com:twoscoops/django-admin2 into develop 2013-07-06 18:30:19 +02:00
Daniel Greenfeld
c007924df0 PEP-8 of filters 2013-07-06 18:28:05 +02:00
Daniel Greenfeld
9a8a836141 PEP-8 of filters 2013-07-06 18:26:29 +02:00
Daniel Greenfeld
12d19fc0ee Merge pull request #278 from ifosch/utils-tests-improvements 
djadmin2.utils.model_options tested to adapt to model._meta changes
 2013-07-06 09:26:00 -07:00
Daniel Greenfeld
115c7f9a09 Merge branch 'list_filter' of git://github.com/beezz/django-admin2 into beezz-list_filter 2013-07-06 17:59:21 +02:00
Michal Kuffa
229db4ff86 minor bugfix 2013-07-06 17:38:49 +02:00
Daniel Greenfeld
ac2ce6e647 fix indentation issues 2013-07-06 17:35:58 +02:00
Ignasi Fosch
07789f566f djadmin2.utils.model_options tested to adapt to model._meta changes 2013-07-06 17:34:01 +02:00
Michal Kuffa
0862210d4d Added id to list_filters container 2013-07-06 16:47:11 +02:00
Daniel Greenfeld
847d0ee78f Add an action_name context variable to model form views 2013-07-06 16:39:42 +02:00
Michal Kuffa
6bd314631b add docs to our custom widgets and default mapping, just to not formatting 2013-07-06 16:27:55 +02:00
Michal Kuffa
d433013fcc Merge remote-tracking branch 'upstream/develop' into list_filter 
Conflicts:
	djadmin2/views.py
 2013-07-06 16:22:14 +02:00
Michal Kuffa
4522e65ce6 Added list_filter block 2013-07-06 16:07:43 +02:00
Michal Kuffa
21e18f9adc Added djadmin2.filters module. 
This module is handling list filter creation by inspecting the model of
supplied queryset. Contains default mapping for field type filters to
our custom form widgets that are rendering links instead of inputs.
 2013-07-06 15:59:55 +02:00
Michal Kuffa
d41a70143e build_list_filter method added to ModelListView. This method take care of ModelAdmin2.Meta.list_filter option 2013-07-06 15:47:09 +02:00
Daniel Greenfeld
819f8cd677 merge 2013-07-06 15:42:25 +02:00
Daniel Greenfeld
e7d4ef4fbc Merge pull request #258 from dbrgn/i18n 
Translation Stuff
 2013-07-06 06:34:11 -07:00
Danilo Bargen
673a3027dd Added Italian translation file 2013-07-06 15:27:19 +02:00
bootandy
9f449a6b66 moving templates to djadmin 2013-07-06 15:23:08 +02:00
Danilo Bargen
ee4dfb4ac6 Added Català translation 2013-07-06 15:19:22 +02:00
bootandy
1ef08cc20f first itteration 2013-07-06 15:18:01 +02:00
Daniel Greenfeld
f128b23643 Merge branch 'docs' of git://github.com/bootandy/django-admin2 into bootandy-docs 2013-07-06 15:02:35 +02:00
Danilo Bargen
3c44a8b930 Changed inconsistent use of "login/logout" 2013-07-06 15:02:33 +02:00
Danilo Bargen
2842699b71 Added German and Spanish translation files 2013-07-06 14:54:21 +02:00
Danilo Bargen
a6d407b887 Fixes in language files 2013-07-06 14:46:15 +02:00
bootandy
679a997f80 update docs - context variables 2013-07-06 14:40:49 +02:00
Ignasi Fosch
260cabcddf Actions tests included in runtest.py execution 2013-07-06 14:22:38 +02:00
Ignasi Fosch
550c6b684b Moving action tests to another file 2013-07-06 14:17:54 +02:00
NotSqrt
5889c5d849 i18n : fixes for tests -> use string interpolation, not positional interpolation 2013-07-06 13:33:52 +02:00
NotSqrt
187773979b add default english translation, add french translation 2013-07-06 13:33:52 +02:00
NotSqrt
5ab4f33b6a check i18n completeness 2013-07-06 13:33:52 +02:00
Daniel Greenfeld
cf77eb0ec5 Merge branch 'iss236' of git://github.com/dbrgn/django-admin2 into develop 2013-07-06 12:07:54 +02:00
Danilo Bargen
ce5566be82 Show verbose column name in list view (fixes #236) 2013-07-06 11:53:46 +02:00
Daniel Greenfeld
fa94f81e7f Merge 2013-07-06 11:36:42 +02:00
Danilo Bargen
3e31974b39 Added model_attr_verbose_name template filter. 
Renamed the model_field_verbose_name to model_attr_verbose_name in
order to handle both fields and methods.
 2013-07-06 11:32:57 +02:00
Danilo Bargen
6331b94a81 Added model_method_verbose_name util function 2013-07-06 11:32:57 +02:00
Danilo Bargen
56b26fb190 Added new template filter: model_field_verbose_name 2013-07-06 11:32:57 +02:00
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
Daniel Greenfeld
00af2cfbac prep for release 0.4.0 2013-06-30 11:38:39 +02:00
Andrews Medina
1f0856b5d3 Merge branch 'develop' of https://github.com/twoscoops/django-admin2 into admin_view 2013-06-26 23:23:48 -03:00
Andrews Medina
bacf9b66cb implemented AdminView.get_view_kwargs method. 2013-06-26 23:22:52 -03:00
Douglas Miranda
1aa9a02957 add a basic style for login form 2013-06-24 23:49:55 -04:00
Ethan Soergel
b0ff9abf5f converted indentation to two spaces in templates 2013-06-24 11:25:42 -04:00
Andrews Medina
9ee3275fd0 setting attrname for AdminView default name. 2013-06-23 15:36:01 -03:00
Andrews Medina
4bf06dd6c2 migrating the views to be admin views. 
generating the get_urls dynamically and
support permissions.
 2013-06-23 02:52:58 -03:00
Andrews Medina
330cafa309 added name argument in AdminView. 2013-06-22 01:30:09 -03:00
Andrews Medina
39bf48ca20 refactored ModelAdminBase2. 2013-06-21 10:16:08 -03:00
Andrews Medina
b44c66e301 implemented ModelAdminBase2 metaclass. 2013-06-21 02:41:28 -03:00
Andrews Medina
7a0f29f2c6 added AdminView. 2013-06-21 00:05:23 -03:00
Douglas Miranda
d008b3e842 fix: issue #199 static jQuery version and add jQuery fallback 2013-06-18 21:30:16 -04: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
Andrews Medina
27544d5a51 Added more tests for get_attr templatetag. 2013-06-12 17:08:21 -03:00
Douglas Miranda
2ccb399c11 fix navbar and breadcrumb on the login page - issue #196 2013-06-10 02:02:10 -04:00
Daniel Greenfeld
8f2f9fa280 Merge pull request #193 from andrewsmedina/list_display_callables 
Added support for callabels in list_display.
 2013-06-07 01:49:08 -07:00
Daniel Greenfeld
56466a61bd Merge branch 'implement_search_fields' of git://github.com/waustin/django-admin2 into waustin-implement_search_fields 2013-06-07 10:08:49 +02:00
Andrews Medina
5974642840 Added support for callabels in list_display. 2013-06-07 00:07:24 -03: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
Wade Austin
2af4aed976 added lookup_needs_distinct from django.contrib.admin 2013-06-06 12:50:45 -05:00
Wade Austin
9ea725600f Add search form to model list template. Form is only displayed if search_fields is not None 2013-06-06 12:49:34 -05:00
Wade Austin
26eeaf14aa Add search_fields to MODEL_ADMIN_ATTRS 2013-06-06 12:48:36 -05:00
Gregor Müllegger
911dcb442a Moving create_extra_permissions to the more appropriate permissions module. 2013-06-06 10:29:10 +02:00
Daniel Greenfeld
bb32ae8bf2 Merge pull request #182 from gregmuellegger/issues/181 
Fixes #181 -- Choices were not copied for Select widgets for floppified forms
 2013-06-04 21:43:22 -07:00
Gregor Müllegger
1a04f285ff Fixes #181 -- Choices were not copied for Select widgets for floppified forms. 2013-06-04 22:31:59 +02:00
Daniel Greenfeld
806e032032 fixes #165 we now can control what gets displayed 2013-06-04 21:22:28 +02:00
Daniel Greenfeld
777e82672d more docs for #161 2013-06-04 20:30:41 +02: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
aaad5636fa Got actions where we want them. #161 2013-06-04 19:24:09 +02:00
Daniel Greenfeld
2be7320425 more cleanup for #161, this includes some documentation 2013-06-04 19:16:25 +02:00
Daniel Greenfeld
1c503be2d8 correcting issue with action permissions #161 2013-06-04 19:12:21 +02:00
Daniel Greenfeld
9d6cbe3094 Making permissions easier to manage 2013-06-04 19:03:40 +02:00
Daniel Greenfeld
39a4d01706 Test fixes 2013-06-04 11:35:47 +02:00
Daniel Greenfeld
b7feb5f284 Merge branch 'drop_down_fires_nothing_selected' of git://github.com/waustin/django-admin2 into waustin-drop_down_fires_nothing_selected 2013-06-04 11:21:07 +02:00
Wade Austin
4b8b8d8b47 Fix for Issue #178 
If an action is selected and no objects are selected the message "Items must be selected in order to perform actions on them. No items have been changed." is displayed instead of the user being sent to Action confirmation screen.
 2013-06-03 21:09:41 -05:00
Daniel Greenfeld
45855f9b50 German to English 😉 2013-06-03 23:30:48 +02:00
Daniel Greenfeld
5be8972dac Merge branch 'modellist-170' of git://github.com/ludw/django-admin2 into ludw-modellist-170 2013-06-03 23:26:42 +02:00
Audrey Roy
b3bb9dbf82 Merge pull request #177 from audreyr/develop 
Merge in @paurosello's commit
 2013-06-03 14:05:39 -07:00
Audrey Roy
03d5ed03f5 Fix merge conflict. Remove extrajs block. 2013-06-03 22:51:15 +02:00
Audrey Roy
cc6e8467c4 Rename constants module to settings 2013-06-03 22:44:16 +02:00
paurosello
b0a8594990 Trying to fix issue #173. 
Every block is finished with it's own name.
 2013-06-03 22:28:41 +02:00
Daniel Greenfeld
d140086dd1 fixes #172 2013-06-03 20:46:17 +02:00
Ludvig Wadenstein
a802dfe8ae Replaced actions select with button dropdown. 2013-06-02 20:58:27 +02:00
Ludvig Wadenstein
574037acfe Chackbox column has apropriate width 2013-06-02 20:18:47 +02:00
Ludvig Wadenstein
c45a544a1d List row links to update or read page based on permissions 2013-06-02 20:17:04 +02:00
Daniel Greenfeld
d52bc0fe15 Document actions 2013-06-01 19:23:15 +02:00
Daniel Greenfeld
7827bf0003 fixes #159 and lays the ground for more things 2013-06-01 18:02:01 +02:00
Daniel Greenfeld
972968b5b1 Move towards internal consistency of URL name definitions 2013-06-01 13:48:53 +02:00
Audrey Roy
d72d7e4deb Fix error on create from this form. 2013-06-01 12:54:15 +02:00
Audrey Roy
f2c8480a2f Merge pull request #167 from audreyr/develop 
Document custom CSS better.
 2013-06-01 03:36:36 -07:00
Audrey Roy
68c5f11b85 Document custom CSS better. 2013-06-01 12:35:49 +02:00
Audrey Roy
b389af9bb9 Add delete button to edit form as per issue #72. 2013-05-31 22:21:04 +02:00
Daniel Greenfeld
f822eedae9 merge 2013-05-31 17:41:20 +02:00
Daniel Greenfeld
83689f37d6 merge 2013-05-31 17:40:25 +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
Gregor Müllegger
0690385b4c Fixes #160 -- Marking a few missed strings as translatable. 2013-05-31 15:37:43 +02:00
Daniel Greenfeld
16c9b8c3ee prep for v0.3.0 2013-05-31 10:21:02 +02:00
Daniel Greenfeld
be07421d44 Removed admins.py and placed calls to ModelAdmin2 from top namespace 2013-05-31 08:57:25 +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
Daniel Greenfeld
fd6c0a57b3 Added Roman Gladkov as a contributor, PEP8 and djadmin2 standards fixes 2013-05-31 08:36:09 +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
2b172fdcc2 merge from develop 2013-05-31 06:55:34 +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
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
096267c674 New immutable object type that is properly frozen. Part of #155 2013-05-30 12:11:49 +02:00
Daniel Greenfeld
b2fb02b976 New immutable object type that is properly frozen. Part of #155 2013-05-30 12:11:19 +02:00
Daniel Greenfeld
30d1abe5d4 PEP-8 work 2013-05-30 11:35:58 +02:00
Ben Tappin
06302a7ed6 Tweak NestedObjects (and tests) comments. 2013-05-29 14:10:56 +01:00
Ben Tappin
f4f400734c Use utils.model_options() in views and change utils import. 2013-05-29 14:09:26 +01:00
Ben Tappin
65de6f148f Use utils.model_options(). 2013-05-29 13:50:07 +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
Daniel Greenfeld
5fcccb6183 Remove print statement. Fixes #143 2013-05-29 12:17:08 +02:00
Gregor Müllegger
b54048c744 Re-wording the variable 'backend' based on @RaphaelKimmig's code review. 2013-05-29 11:00:59 +02:00
Gregor Müllegger
c0a3df680c Fix permission denied errors for API views. 2013-05-29 10:47:45 +02:00
Gregor Müllegger
42d89a7585 Moving permission checking from AdminModel2Mixin to PermissionMixin were it belongs. 2013-05-29 10:47:45 +02:00
Gregor Müllegger
2771d160a7 Using new permission handling in templates. 2013-05-29 10:47:45 +02:00
Gregor Müllegger
8c88362197 Removing old permission handling. 2013-05-29 10:44:22 +02:00
Gregor Müllegger
d0635b79c3 Adding a IsSuperuserPermission class. 2013-05-29 10:44:22 +02:00
Gregor Müllegger
02a68faadd Adding more information to the docstring of the template permission handler. 2013-05-29 10:44:22 +02:00
Gregor Müllegger
635bbca553 Adding |for_view filter to bind permissions for a view name. 2013-05-29 10:44:22 +02:00
Gregor Müllegger
9ce77ae572 Adding possibility to traverse permissions by admin name. 2013-05-29 10:44:22 +02:00
Gregor Müllegger
2aca9df7e2 Adding possibility to swap model admin that is checked for permissions in the template. 2013-05-29 10:44:22 +02:00
Gregor Müllegger
c6a11efca8 Adding ability to check for permissions of any registered model admin in the templates. 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
Gregor Müllegger
65d54083ce Adding reference documentation for permission handling. 2013-05-29 10:44:22 +02:00
Gregor Müllegger
ab778191c6 Adding the ability to check for permissions in templates. 2013-05-29 10:44:22 +02:00
Gregor Müllegger
324cdbaa17 Moving permission logic of views into its own mixin. Also allow to check permission on other views via the PermissionMixin. 2013-05-29 10:43:09 +02:00
Gregor Müllegger
0c7615b733 Implementing a class-based permission handling. 2013-05-29 10:43:09 +02:00
Andrew Ingram
23b0389c1a Rename app-index view to app_index 2013-05-28 13:24:18 +01:00
Andrew Ingram
3bb555fb56 add missing test for utils.model_app_label 2013-05-28 13:24:02 +01: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
Daniel Greenfeld
a94416d99e Merge pull request #149 from AndrewIngram/l18n 
Template internationalization
 2013-05-25 14:26:00 -07:00
Andrew Ingram
a4d77a9309 Template internationalization 2013-05-25 18:44:48 +01:00
Ben Tappin
c79f53bb02 Add tests for admin2 templatetags and fix bug. 2013-05-25 16:45:26 +01:00
Daniel Greenfeld
906b8cbf4e Adding endline to bump things forward 2013-05-24 20:48:43 +02:00
Daniel Greenfeld
99204be715 Added tests for djadmin.utils 2013-05-24 16:22:54 +02: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
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