Fixed #10516 -- Corrected admin search when the search_fields definition contains multiple fields on the same base model. Thanks to Zain Memon for the patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@10684 bcc190cf-cafb-0310-a4f2-bffc1f526a37

1 files changed, 107 insertions, 0 deletions

diff --git a/tests/regressiontests/admin_views/fixtures/multiple-child-classes.json b/tests/regressiontests/admin_views/fixtures/multiple-child-classes.json
new file mode 100644
index 0000000000..5cadf4c1c5
--- /dev/null
+++ b/tests/regressiontests/admin_views/fixtures/multiple-child-classes.json
@@ -0,0 +1,107 @@
+[
+    {
+        "pk": 1,
+         "model": "admin_views.title",
+         "fields":
+        {
+        }
+    },
+
+    {
+        "pk": 2,
+         "model": "admin_views.title",
+         "fields":
+        {
+        }
+    },
+
+    {
+        "pk": 3,
+         "model": "admin_views.title",
+         "fields":
+        {
+        }
+    },
+
+    {
+        "pk": 4,
+         "model": "admin_views.title",
+         "fields":
+        {
+        }
+    },
+
+    {
+        "pk": 1,
+         "model": "admin_views.titletranslation",
+         "fields":
+        {
+            "text": "Bar",
+             "title": 1
+        }
+    },
+
+    {
+        "pk": 2,
+         "model": "admin_views.titletranslation",
+         "fields":
+        {
+            "text": "Foo",
+             "title": 2
+        }
+    },
+
+    {
+        "pk": 3,
+         "model": "admin_views.titletranslation",
+         "fields":
+        {
+            "text": "Few",
+             "title": 3
+        }
+    },
+
+    {
+        "pk": 4,
+         "model": "admin_views.titletranslation",
+         "fields":
+        {
+            "text": "Bas",
+             "title": 4
+        }
+    },
+
+    {
+        "pk": 1,
+         "model": "admin_views.recommender",
+         "fields":
+        {
+        }
+    },
+
+    {
+        "pk": 4,
+         "model": "admin_views.recommender",
+         "fields":
+        {
+        }
+    },
+
+    {
+        "pk": 2,
+         "model": "admin_views.recommendation",
+         "fields":
+        {
+            "recommender": 1
+        }
+    },
+
+    {
+        "pk": 3,
+         "model": "admin_views.recommendation",
+         "fields":
+        {
+            "recommender": 4
+        }
+    }
+]
\ No newline at end of file