Commit graph

58 commits

Author SHA1 Message Date
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
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