Ticket #10918: 10918_admin_search_missing_fk_to_field.diff

django/contrib/admin/views/main.py

@@ -52 +52 @@
         self.params = dict(request.GET.items())
         if PAGE_VAR in self.params:
             del self.params[PAGE_VAR]
-        if TO_FIELD_VAR in self.params:
-            del self.params[TO_FIELD_VAR]
         if ERROR_FLAG in self.params:
             del self.params[ERROR_FLAG]
 
@@ -173 +171 @@
 
         qs = self.root_query_set
         lookup_params = self.params.copy() # a dictionary of the query string
-        for i in (ALL_VAR, ORDER_VAR, ORDER_TYPE_VAR, SEARCH_VAR, IS_POPUP_VAR):
+        for i in (ALL_VAR, ORDER_VAR, ORDER_TYPE_VAR, SEARCH_VAR, IS_POPUP_VAR, TO_FIELD_VAR):
             if i in lookup_params:
                 del lookup_params[i]
         for key, value in lookup_params.items():

tests/regressiontests/admin_views/tests.py

@@ -1694 +1694 @@
         # confirm the search returned 1 object
         self.assertContains(response, "\n1 recommendation\n")
 
+    def test_with_fk_to_field(self):
+        """ Ensure that the to_field GET parameter is preserved when a search
+            is performed.
+            Refs #10918.
+        """
+        from django.contrib.admin.views.main import TO_FIELD_VAR
+        response = self.client.get('/test_admin/admin/auth/user/?q=joe&%s=username' % TO_FIELD_VAR)
+        self.assertContains(response, "\n1 user\n")
+        self.assertContains(response, '<input type="hidden" name="t" value="username"/>')
+        
 class AdminInheritedInlinesTest(TestCase):
     fixtures = ['admin-views-users.xml',]