summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorLuke Plant <L.Plant.98@cantab.net>2011-02-21 19:15:02 +0000
committerLuke Plant <L.Plant.98@cantab.net>2011-02-21 19:15:02 +0000
commitfdf9602961bce9439d489ea2d1b11b919b0c7cf4 (patch)
tree16564fd6fa9b5b613420aa1377965e8d8853b7e0 /django
parent1b062f6613ba234cd2e72df9823ae1b65de02b21 (diff)
Fixed #11058 - list_display_links doesn't allow callables not defined in the model
Thanks to dvine for the report and julien for the patch. git-svn-id: http://code.djangoproject.com/svn/django/trunk@15619 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django')
-rw-r--r--django/contrib/admin/validation.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/django/contrib/admin/validation.py b/django/contrib/admin/validation.py
index 027db6383e..ba3525624d 100644
--- a/django/contrib/admin/validation.py
+++ b/django/contrib/admin/validation.py
@@ -46,9 +46,8 @@ def validate(cls, model):
if hasattr(cls, 'list_display_links'):
check_isseq(cls, 'list_display_links', cls.list_display_links)
for idx, field in enumerate(cls.list_display_links):
- fetch_attr(cls, model, opts, 'list_display_links[%d]' % idx, field)
if field not in cls.list_display:
- raise ImproperlyConfigured("'%s.list_display_links[%d]'"
+ raise ImproperlyConfigured("'%s.list_display_links[%d]' "
"refers to '%s' which is not defined in 'list_display'."
% (cls.__name__, idx, field))