Fixed #20865 -- Fixed raw_id_fields to work with callable limit_choices_to.

2 files changed, 10 insertions, 1 deletions

diff --git a/django/contrib/admin/widgets.py b/django/contrib/admin/widgets.py
index eeae846320..c4b15cdd6a 100644
--- a/django/contrib/admin/widgets.py
+++ b/django/contrib/admin/widgets.py
@@ -116,6 +116,8 @@ def url_params_from_lookup_dict(lookups):
     if lookups and hasattr(lookups, 'items'):
         items = []
         for k, v in lookups.items():
+            if callable(v):
+                v = v()
             if isinstance(v, (tuple, list)):
                 v = ','.join([str(x) for x in v])
             elif isinstance(v, bool):
diff --git a/tests/admin_widgets/tests.py b/tests/admin_widgets/tests.py
index d4521a585e..5a88df1e57 100644
--- a/tests/admin_widgets/tests.py
+++ b/tests/admin_widgets/tests.py
@@ -226,6 +226,13 @@ class AdminForeignKeyRawIdWidget(DjangoTestCase):
         self.assertEqual(lookup1, {'color__in': 'red,blue'})
         self.assertEqual(lookup1, lookup2)
 
+    def test_url_params_from_lookup_dict_callable(self):
+        def my_callable():
+            return 'works'
+        lookup1 = widgets.url_params_from_lookup_dict({'myfield': my_callable})
+        lookup2 = widgets.url_params_from_lookup_dict({'myfield': my_callable()})
+        self.assertEqual(lookup1, lookup2)
+
 
 class FilteredSelectMultipleWidgetTest(DjangoTestCase):
     def test_render(self):
@@ -915,4 +922,4 @@ class AdminRawIdWidgetSeleniumChromeTests(AdminRawIdWidgetSeleniumFirefoxTests):
     webdriver_class = 'selenium.webdriver.chrome.webdriver.WebDriver'
 
 class AdminRawIdWidgetSeleniumIETests(AdminRawIdWidgetSeleniumFirefoxTests):
-    webdriver_class = 'selenium.webdriver.ie.webdriver.WebDriver'
\ No newline at end of file
+    webdriver_class = 'selenium.webdriver.ie.webdriver.WebDriver'