diff options
| author | Jacob Kaplan-Moss <jacob@jacobian.org> | 2009-03-17 20:51:06 +0000 |
|---|---|---|
| committer | Jacob Kaplan-Moss <jacob@jacobian.org> | 2009-03-17 20:51:06 +0000 |
| commit | 75b286798f07eea7f7edca6356e7fed1202f32c1 (patch) | |
| tree | afdaaf3c4be7c83fbefafccd34f2859c6a74988e /django | |
| parent | 6b850951697437126b448e5126c273a389e8a749 (diff) | |
[1.0.X] `ModelAdmin` validation now runs when using the `site.register(Model, **kwargs)` form.
Backport if [10074] from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10076 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django')
| -rw-r--r-- | django/contrib/admin/sites.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/django/contrib/admin/sites.py b/django/contrib/admin/sites.py index c16ab6a110..cbf1666804 100644 --- a/django/contrib/admin/sites.py +++ b/django/contrib/admin/sites.py @@ -49,14 +49,15 @@ class AdminSite(object): If a model is already registered, this will raise AlreadyRegistered. """ + if not admin_class: + admin_class = ModelAdmin + # Don't import the humongous validation code unless required if admin_class and settings.DEBUG: from django.contrib.admin.validation import validate else: validate = lambda model, adminclass: None - if not admin_class: - admin_class = ModelAdmin if isinstance(model_or_iterable, ModelBase): model_or_iterable = [model_or_iterable] for model in model_or_iterable: |