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

487 commits

Author SHA1 Message Date
Kevin Diale
966e549ace Basic interface done. 2013-07-31 12:57:48 -04:00
the5fire
6f531ea09f Test for the ModelAdmin2 get_index_kwargs 2013-07-31 07:17:07 +08:00
Kevin Diale
8dc0821539 Left in a wee bit of debugging code. 2013-07-30 17:20:27 -04:00
Kevin Diale
29eaa661d5 Drilling down works on a functional level. Gotta set up interface and 
tests.

On a related note, TAKE THAT DJANGO FILTERS.
 2013-07-30 16:28:24 -04:00
Kevin Diale
6ff47746df Added in actions_selection_counter, will add tests/polish next commit. 2013-07-29 14:48:05 -04:00
the5fire
e8c5e9ec52 add admin model list pagination template 2013-07-28 11:19:05 +08:00
the5fire
ee0c1b0031 fix list_per_page can't enable in model list view 2013-07-28 10:26:08 +08:00
Andrews Medina
3c7fc0fc0e Merge branch 'develop' into admin_view 
Conflicts:
	djadmin2/types.py
 2013-07-26 17:55:55 -03:00
Andrews Medina
26ba68115f Using six to set the ModelAdminBase2 metaclass. 2013-07-26 17:41:58 -03:00
Chris Jones
4959a095c4 fix merge error. 2013-07-18 17:44:19 -07:00
Kenneth Love
3844a952c0 merge 2013-07-18 17:41:33 -07:00
Kenneth Love
738e3a9dd8 template changes 2013-07-18 17:40:54 -07:00
Chris Jones
e7f8170237 Ooooooooo pretty. 2013-07-18 17:33:19 -07:00
Kenneth Love
af11cb012e Merge branch 'fix-history' of github.com:brack3t/django-admin2 into fix-history 2013-07-18 17:31:11 -07:00
Kenneth Love
e5f1940f3e action_type property 2013-07-18 17:31:08 -07:00
Chris Jones
57ef2a428c Nicer to look at. 2013-07-18 17:30:41 -07:00
Chris Jones
69f2a357f8 Why don't you PEP your 8! Add in change messages. 2013-07-18 17:23:48 -07:00
Kenneth Love
52c337a72c force_text for object_repr and condition on history link 2013-07-18 17:16:07 -07:00
Kenneth Love
acae0a2620 icons 2013-07-18 17:02:40 -07:00
Kenneth Love
99ae00a0ae show user that performed action 2013-07-18 16:56:08 -07:00
Kenneth Love
802265b60f Merge branch 'fix-history' of github.com:brack3t/django-admin2 into fix-history 2013-07-18 16:54:26 -07:00
Kenneth Love
ee2ca9feff template updates 2013-07-18 16:54:22 -07:00
Chris Jones
ee1c90cd9f Working model history view. 2013-07-18 16:51:16 -07:00
Kenneth Love
a7951353a8 Merge branch 'fix-history' of github.com:brack3t/django-admin2 into fix-history 2013-07-18 16:38:20 -07:00
Kenneth Love
7dbf50426f model_history template 2013-07-18 16:38:13 -07:00
Chris Jones
d62b612583 nevermind. 2013-07-18 16:38:00 -07:00
Chris Jones
f7ef575709 Should be a detail view. 2013-07-18 16:37:18 -07:00
Chris Jones
82d9e7ae65 PEP8 love. 2013-07-18 16:36:31 -07:00
Chris Jones
4089ad4aab PEP8 all the things. Add in new history url. 2013-07-18 16:30:40 -07:00
Chris Jones
555588f13c PEP8 2013-07-18 16:08:38 -07:00
Chris Jones
ae39a26e13 Use model properties for action ints. 2013-07-18 15:58:31 -07:00
Kenneth Love
598b0a704f basics for recording history 2013-07-18 13:59:08 -07:00
Chris Jones
14d2a20431 Merge branch 'fix-history' of github.com:brack3t/django-admin2 into fix-history 2013-07-18 13:46:17 -07:00
Chris Jones
6273e68dde Stealing the logger from the old admin. 2013-07-18 13:46:00 -07:00
Kenneth Love
76ab676530 more html 2013-07-18 13:40:50 -07:00
Kenneth Love
ef77c8242d Merge branch 'fix-history' of github.com:brack3t/django-admin2 into fix-history 2013-07-18 13:06:04 -07:00
Kenneth Love
4cfe10e645 actual data in history template 2013-07-18 13:05:56 -07:00
Chris Jones
fb0e73a37e PEP8 2013-07-18 13:04:47 -07:00
Kenneth Love
5ed5123836 started on history 2013-07-18 13:00:14 -07:00
Daniel Greenfeld
9e4d2ec039 Move default theme to it's own app. This way we are following the same pattern that other themes will have to use fix #333 2013-07-18 17:55:08 +02:00
Daniel Greenfeld
82e56bdae5 prep for #273 2013-07-18 16:32:50 +02:00
Ludvig Wadenstein
3cc592a906 Inlines separated into stacked and tabular 2013-07-18 15:02:07 +02:00
Daniel Greenfeld
9957e782c3 This should help with migration efforts and related documentation like #284 2013-07-16 20:13:11 +02:00
Ludvig Wadenstein
116ae29dab Removed some duplication of savebutton markup in templates 2013-07-15 22:47:10 +02:00
Daniel Greenfeld
854832accd Fix setup.py issue 2013-07-14 15:29:20 +02:00
Daniel Greenfeld
54c4bcf933 prep for release of 0.5.1. 2013-07-14 11:50:13 +02:00
d1ffuz0r
ae0ab23b12 unused attribute was removed 2013-07-10 10:59:39 +07:00
Daniel Greenfeld
c545912561 Merge pull request #322 from douglasmiranda/fix-fixed-height 
fixing the fixed height of .change_form
 2013-07-09 05:55:56 -07:00
Danilo Bargen
bed88973d7 Compiled all messages. Ready for release. Fixes #314, refs #317 2013-07-09 12:22:36 +02:00
Danilo Bargen
783401415d Added updated translation files from transifex 2013-07-09 12:21:07 +02:00
Danilo Bargen
aeb8a84726 Pulled new translations 2013-07-09 11:34:40 +02:00
Douglas Miranda
90342afba2 fixing the fixed height of .change_form in order to provide an "auto height" 2013-07-09 03:04:28 -04:00
d1ffuz0r
8def10b2da Fixed #292 added missing default columns and filters 2013-07-09 13:10:48 +07:00
Daniel Greenfeld
c6e077250e update release to 0.5.0 for #317 2013-07-08 19:28:04 +02:00
Daniel Greenfeld
da6ff9f3ce Tweaks to make #308 work 2013-07-08 19:14:19 +02:00
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