Hopiu/django-admin2
1
0
Fork 0
mirror of https://github.com/jazzband/django-admin2.git synced 2026-03-16 22:20:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
1099 commits 3 branches 11 tags 3.7 MiB
Commit graph

210 commits

Author SHA1 Message Date
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
038313c81c merge 2013-07-06 18:33:44 +02:00
Michal Kuffa
075f887837 Added basic test for list_filter feature 2013-07-06 17:39:36 +02:00
Michal Kuffa
aefd7d8df0 Added simple test for presence of list_filter container 2013-07-06 16:48:42 +02:00
Michal Kuffa
04bb629a42 Removed unused imports 2013-07-06 16:47:52 +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
Daniel Greenfeld
03acbe0486 Merge branch 'template_rename2' of git://github.com/bootandy/django-admin2 into bootandy-template_rename2 2013-07-06 16:19:12 +02:00
Michal Kuffa
473ea98f98 Added list_filter attribute to contrib's admin, admin2 definition of Post, Comment model admin. 2013-07-06 16:09:03 +02:00
bootandy
a8cf4554ad more example template admin2 reference to djadmin2 2013-07-06 15:56:46 +02:00
bootandy
1ef08cc20f first itteration 2013-07-06 15:18:01 +02:00
NotSqrt
5889c5d849 i18n : fixes for tests -> use string interpolation, not positional interpolation 2013-07-06 13:33:52 +02:00
NotSqrt
5de843313b make the examples use i18n 2013-07-06 13:33:52 +02:00
Audrey Roy
807b3776fb Better example project home. Close #241. 2013-07-06 10:57:00 +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
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
Wade Austin
e199b13c3c search_fields test cases 2013-06-06 16:25:36 -05:00
Wade Austin
858d39e5f4 Added search_fields to admin and admin2 class for the example project 2013-06-06 12:51:44 -05:00
Gregor Müllegger
b88587f682 Adding test to check if view permissions have been created. 2013-06-06 10:29:10 +02: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
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
Ludvig Wadenstein
9c296ccff5 Updated tests 2013-06-02 21:09:04 +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
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
be07421d44 Removed admins.py and placed calls to ModelAdmin2 from top namespace 2013-05-31 08:57:25 +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
cff5674539 revert auth tests 2013-05-31 10:37:14 +07: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
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
Ben Tappin
06302a7ed6 Tweak NestedObjects (and tests) comments. 2013-05-29 14:10:56 +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
c0a3df680c Fix permission denied errors for API views. 2013-05-29 10:47:45 +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
ab778191c6 Adding the ability to check for permissions in templates. 2013-05-29 10:44:22 +02:00
Gregor Müllegger
0c7615b733 Implementing a class-based permission handling. 2013-05-29 10:43:09 +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
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
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
Gregor Müllegger
494b999922 Fixed #138 -- UserCreateForm and UserUpdateForm get floppified. 2013-05-23 20:16:19 +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
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
a5cb74fb63 Update django.contrib.admin reference file to provide reference for this pull request 2013-05-22 17:58:29 +02:00
Peter Inglesby
ade92956d0 Handle actions by POSTing to ModelListView 2013-05-22 11:32:01 +01:00
Andrew Ingram
5abe25e4c2 Fix broken tests 2013-05-22 01:22:39 +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
Daniel Greenfeld
1a669cac59 django-debug-toolbar no longer interrupts on form redirects 2013-05-21 23:47:35 +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
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
Daniel Greenfeld
0859342ae4 Merge pull request #97 from RaphaelKimmig/rename-modeladmin-model_admin 
rename modeladmin to model_admin fixes #91
 2013-05-19 07:30:40 -07:00
Gregor Müllegger
155f19db52 Adding smoke tests for User and Group API resources. 2013-05-19 16:01:30 +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
Gregor Müllegger
e745291445 Fixing issue that permissions cannot be hyperlinked from users and group API resource. 2013-05-19 15:32:51 +02:00
Daniel Greenfeld
26cb6f1594 Example project home page 2013-05-19 15:00:10 +02:00
Gregor Müllegger
bc899a9389 Adding support for pagination. 2013-05-19 14:23:18 +02:00
Gregor Müllegger
8ea3b97786 Using django's TestCase and instead of the one from unittest. 2013-05-19 14:23:18 +02:00
Gregor Müllegger
631727d0f0 Tests for the API index view. 2013-05-19 14:23:18 +02:00
Gregor Müllegger
09dd2095e3 Fixing names for views beeing more consistent and tests for API views. 2013-05-19 14:22:50 +02:00
Gregor Müllegger
68d6b96f84 Adding an index resource for the API. 2013-05-19 14:21:57 +02:00
Ludvig Wadenstein
09a1f2465f Added test for detail view in api 2013-05-19 14:21:22 +02:00
Ludvig Wadenstein
585d4d9e8e Just commiting to be able to merge 2013-05-19 14:21:21 +02:00
Ludvig Wadenstein
6cc5b5e18a Added test for unicode field in rest api 2013-05-19 14:20:18 +02:00
Gregor Müllegger
944a846eb3 Adding rest_framework to the INSTALLED_APPS so that the explorable API browser works. 2013-05-19 14:20:17 +02:00
Gregor Müllegger
8e2aebcc09 Renaming a few things to make more sense and to stick to conventions. 2013-05-19 14:19:57 +02:00
Ludvig Wadenstein
9f25a3671a Added basic test for api index view 2013-05-19 14:19:57 +02:00
Ludvig Wadenstein
2a28417f0f Added test for unicode field in rest api 2013-05-19 14:17:07 +02:00
Ludvig Wadenstein
bfc61eadcb Added basic test for api index view 2013-05-19 14:16:15 +02:00
Ludvig Wadenstein
1c77a0a740 Changed blog.tests into a directory. WARNING: remove test.pyc 2013-05-19 14:16:15 +02:00
Andrew Ingram
0ebedc8dfd Merge remote-tracking branch 'origin/master' into inline-formsets 2013-05-19 13:11:01 +02:00
Daniel Greenfeld
69bf7b497e Get djang-debug-toolbar into the demo 2013-05-19 13:10:02 +02:00
Ludvig Wadenstein
f411b63fd4 Added django-coverage as test runner 2013-05-19 12:12:01 +02:00
Andrew Ingram
2e772ce8a3 Basic support for inline form sets 2013-05-19 11:21:25 +02:00
Daniel Greenfeld
28b6a0f72a pep8 of code 2013-05-19 10:09:12 +02:00
Raphael Kimmig
fcdaa9c9fc add more tests for the example app 2013-05-19 09:59:28 +02:00
Daniel Greenfeld
f5f94c352c remove confusing comments 2013-05-18 18:24:41 +02:00
Andrew Ingram
1fad491359 Merge remote-tracking branch 'origin/master' into custom-form-classes 2013-05-18 17:05:20 +02:00
Andrew Ingram
24bfdab8a6 custom form class support 
Also sets framework for adding kwargs to any admin2 view
 2013-05-18 16:59:06 +02:00
Daniel Greenfeld
674b75042b Merge pull request #48 from AndrewIngram/registry 
Registry
 2013-05-18 07:17:19 -07: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
Ludvig Wadenstein
cc3b60f8c2 Added testrunner that works with django 2013-05-18 15:30:32 +02:00
Daniel Greenfeld
3b7f4d7fe8 Views cleanup during merge. 2013-05-18 15:26:47 +02:00
Audrey Roy
9f435fc595 Getting admin2 to use the bootstrap theme properly. 2013-05-18 13:57:22 +02:00
Audrey Roy
52368d9ee1 Give example project models unicode methods 2013-05-18 13:44:00 +02:00
Audrey Roy
e251ab0d05 Merge pull request #37 from audreyr/master 
Expose Post, Comment models in admin of example project
 2013-05-18 04:29:40 -07:00
Audrey Roy
e904f12f8a Merge pull request #36 from RaphaelKimmig/master 
Fix example urls regex
 2013-05-18 04:28:54 -07:00
Audrey Roy
6b892dd1a5 Merge pull request #35 from inglesp/issue10 
Add some tests for views in example app
 2013-05-18 04:28:28 -07:00
Raphael Kimmig
6c187eb978 Fix example urls include regex 2013-05-18 13:27:12 +02:00
Audrey Roy
daf5e1cfb0 Expose Post, Comment models from example in admin 2013-05-18 13:27:10 +02:00
Peter Inglesby
e433228cae Add some tests for views in example app 2013-05-18 13:24:42 +02:00
Audrey Roy
ee7431e34d Merge pull request #33 from RaphaelKimmig/master 
Use relative import for models in example project
 2013-05-18 04:24:32 -07:00
Audrey Roy
c464645cc3 Enabled admin at admin/ in example. Put admin2 at admin2/. 2013-05-18 13:17:15 +02:00
Raphael Kimmig
f756b16ce8 use relative imports in example 2013-05-18 13:12:12 +02:00
Daniel Greenfeld
44ae271a2e Merge branch 'master' of github.com:pydanny/django-admin2 2013-05-18 12:57:11 +02:00
Daniel Greenfeld
7773816c07 getting the views to work 2013-05-18 12:57:01 +02:00
Audrey Roy
5c864d37b1 Ignore and remove .db files from SQLite 2013-05-18 12:34:57 +02:00
Andrew Ingram
e1e3f51291 Root URL access djadmin2 index 2013-05-18 12:24:17 +02:00
Peter Inglesby
b9495b6781 Add example app 2013-05-18 12:12:57 +02:00