diff options
| author | Brian Rosner <brosner@gmail.com> | 2008-07-16 02:01:18 +0000 |
|---|---|---|
| committer | Brian Rosner <brosner@gmail.com> | 2008-07-16 02:01:18 +0000 |
| commit | 83afd39b1aa0e4235a8490ebc7219f97c35a0106 (patch) | |
| tree | 1624c5c53ee258336e35ee2606dd43c8b8349956 /django | |
| parent | 5317864e5fda896e777cfd001ec40a3c924b853a (diff) | |
newforms-admin: Fixed #7772 -- Moved the validation check for when both fields and fieldsets are specified on a ModelAdmin to django/contrib/admin/validation.py. Thanks Julien Phalip for catching this.
git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@7932 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django')
| -rw-r--r-- | django/contrib/admin/options.py | 6 | ||||
| -rw-r--r-- | django/contrib/admin/validation.py | 2 |
2 files changed, 2 insertions, 6 deletions
diff --git a/django/contrib/admin/options.py b/django/contrib/admin/options.py index 07f29acbf0..082d3b3847 100644 --- a/django/contrib/admin/options.py +++ b/django/contrib/admin/options.py @@ -143,12 +143,6 @@ class BaseModelAdmin(object): radio_fields = {} prepopulated_fields = {} - def __init__(self): - # TODO: This should really go in django.core.validation, but validation - # doesn't work on ModelAdmin classes yet. - if self.fieldsets and self.fields: - raise ImproperlyConfigured('Both fieldsets and fields is specified for %s.' % self.model) - def formfield_for_dbfield(self, db_field, **kwargs): """ Hook for specifying the form Field instance for a given database Field diff --git a/django/contrib/admin/validation.py b/django/contrib/admin/validation.py index fbf7de02ed..0d4c2f5607 100644 --- a/django/contrib/admin/validation.py +++ b/django/contrib/admin/validation.py @@ -160,6 +160,8 @@ def _validate_base(cls, model): _check_istuplew('fields', cls.fields) for field in cls.fields: _check_field_existsw('fields', field) + if cls.fieldsets: + raise ImproperlyConfigured('Both fieldsets and fields are specified in %s.' % cls.__name__) # fieldsets if cls.fieldsets: # default value is None |