Commits

Anonymous committed 741e271

Fixed failing tests from [8352]. Thanks Alex Gaynor for the patch.

Comments (0)

Files changed (2)

django/contrib/admin/validation.py

                 if not hasattr(cls, field):
                     if not hasattr(model, field):
                         try:
-                            return opts.get_field(field)
+                            opts.get_field(field)
                         except models.FieldDoesNotExist:
                             raise ImproperlyConfigured("%s.list_display[%d], %r is "
                                 "not a callable or an attribute of %r or found in the model %r."

tests/regressiontests/modeladmin/models.py

 >>> validate(ValidationTestModelAdmin, ValidationTestModel)
 Traceback (most recent call last):
 ...
-ImproperlyConfigured: `ValidationTestModelAdmin.list_display[0]` refers to `non_existent_field` that is neither a field, method or property of model `ValidationTestModel`.
+ImproperlyConfigured: ValidationTestModelAdmin.list_display[0], 'non_existent_field' is not a callable or an attribute of 'ValidationTestModelAdmin' or found in the model 'ValidationTestModel'.
+
 
 >>> class ValidationTestModelAdmin(ModelAdmin):
 ...     list_display = ('users',)