diff options
| author | Simon Charette <charette.s@gmail.com> | 2015-10-28 11:25:25 -0400 |
|---|---|---|
| committer | Simon Charette <charette.s@gmail.com> | 2015-10-29 13:20:44 -0400 |
| commit | c42e4e736a587dc9858fe55fb972aefaa065867d (patch) | |
| tree | 2cdd1cc4702d2622dd65557a4387732177862104 /django | |
| parent | 540de2f7972c6aa68fbf36c6a0da137d768f2067 (diff) | |
Fixed #25622 -- Accounted for generic relations in the admin to field validation
Thanks to Jonathan Liuti for the report and Tim Graham for the review.
Conflicts:
django/contrib/admin/options.py
Diffstat (limited to 'django')
| -rw-r--r-- | django/contrib/admin/options.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/django/contrib/admin/options.py b/django/contrib/admin/options.py index 8176926acb..65653a6967 100644 --- a/django/contrib/admin/options.py +++ b/django/contrib/admin/options.py @@ -485,8 +485,10 @@ class BaseModelAdmin(six.with_metaclass(forms.MediaDefiningClass)): ) for related_object in related_objects: related_model = related_object.related_model + remote_field = related_object.field.rel if (any(issubclass(model, related_model) for model in registered_models) and - related_object.field.rel.get_related_field() == field): + hasattr(remote_field, 'get_related_field') and + remote_field.get_related_field() == field): return True return False |