From b728ab22e1b349e4c716ab005d305c48ad0338dd Mon Sep 17 00:00:00 2001 From: Sergey Fedoseev Date: Wed, 6 Dec 2017 23:54:51 +0500 Subject: [PATCH] Simplified BaseModelAdmin.lookup_allowed() a bit. --- django/contrib/admin/options.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/django/contrib/admin/options.py b/django/contrib/admin/options.py index a5374527fc..51cff980ef 100644 --- a/django/contrib/admin/options.py +++ b/django/contrib/admin/options.py @@ -364,9 +364,8 @@ class BaseModelAdmin(metaclass=forms.MediaDefiningClass): # As ``limit_choices_to`` can be a callable, invoke it here. if callable(fk_lookup): fk_lookup = fk_lookup() - for k, v in widgets.url_params_from_lookup_dict(fk_lookup).items(): - if k == lookup and v == value: - return True + if (lookup, value) in widgets.url_params_from_lookup_dict(fk_lookup).items(): + return True relation_parts = [] prev_field = None