Commit 120d01c2 authored by Russell Keith-Magee's avatar Russell Keith-Magee
Browse files

[1.2.X] Fixed #10918 -- Ensure that the search widget on a raw_id_admin uses... 

[1.2.X] Fixed #10918 -- Ensure that the search widget on a raw_id_admin uses the right field name when the ForeignKey has a to_field definition. Thanks to David Cramer for the report, Collin Anderson for the fix, and Julien Phalip for the test.

Backport of r15657 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15659 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 3a310237

django/contrib/admin/views/main.py

+1 −3
Original line number Diff line number Diff line
@@ -54,8 +54,6 @@ class ChangeList(object): 
        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]
@@ -167,7 +165,7 @@ class ChangeList(object): 
    def get_query_set(self):

        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

+10 −0
Original line number Diff line number Diff line
@@ -1556,6 +1556,16 @@ class AdminSearchTest(TestCase): 
        # 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',]