From 5381317fe37d50384ef9a3bf3fb6b64ff4e9215c Mon Sep 17 00:00:00 2001 From: tschilling Date: Wed, 25 Sep 2013 17:00:51 -0400 Subject: Fixed #21129 -- Prevented admin filter params modifications from throwing an exception. Thanks Tuttle for the report. --- django/contrib/admin/options.py | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'django') diff --git a/django/contrib/admin/options.py b/django/contrib/admin/options.py index 521b2371a6..3b570c1a5f 100644 --- a/django/contrib/admin/options.py +++ b/django/contrib/admin/options.py @@ -348,6 +348,10 @@ class BaseModelAdmin(six.with_metaclass(RenameBaseModelAdminMethods)): # later. return True if hasattr(field, 'rel'): + if field.rel is None: + # This property or relation doesn't exist, but it's allowed + # since it's ignored in ChangeList.get_filters(). + return True model = field.rel.to rel_name = field.rel.get_related_field().name elif isinstance(field, RelatedObject): -- cgit v1.3