Django

Code

Show
Ignore:
Timestamp:
07/15/08 16:43:21 (6 months ago)
Author:
brosner
Message:

newforms-admin: Fixed #5374 -- Added validation for ModelAdmin? and InlineModelAdmin? options including tests. Thanks mrts for initial legwork.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/branches/newforms-admin/django/contrib/admin/sites.py

    r7825 r7929  
    88from django.utils.translation import ugettext_lazy, ugettext as _ 
    99from django.views.decorators.cache import never_cache 
     10from django.conf import settings 
    1011import base64 
    1112import cPickle as pickle 
    …… 
    6667        If a model is already registered, this will raise AlreadyRegistered. 
    6768        """ 
     69        do_validate = admin_class and settings.DEBUG 
     70        if do_validate: 
     71            # don't import the humongous validation code unless required 
     72            from django.contrib.admin.validation import validate 
    6873        admin_class = admin_class or ModelAdmin 
    6974        # TODO: Handle options 
    …… 
    7378            if model in self._registry: 
    7479                raise AlreadyRegistered('The model %s is already registered' % model.__name__) 
     80            if do_validate: 
     81                validate(admin_class, model) 
    7582            self._registry[model] = admin_class(model, self) 
    7683