-
-
Notifications
You must be signed in to change notification settings - Fork 31.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fixed #10516 -- Corrected admin search when the search_fields definit…
…ion 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
- Loading branch information
1 parent
e5757f9
commit b5f0aff
Showing
4 changed files
with
143 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
107 changes: 107 additions & 0 deletions
107
tests/regressiontests/admin_views/fixtures/multiple-child-classes.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 | ||
} | ||
} | ||
] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters