diff options
| author | Anssi Kääriäinen <akaariai@gmail.com> | 2014-07-14 12:50:41 -0400 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2014-07-14 12:51:24 -0400 |
| commit | 572885729e028eae2f2b823ef87543b7c66bdb10 (patch) | |
| tree | c58b745df6cdd7c7f4fe11b71b3fc0158f1c5fb5 /tests/admin_views/admin.py | |
| parent | 1d1debeed439ce4a685859537dd5c587f72d942c (diff) | |
[1.7.x] Fixed #22994 -- regression with generic FK + admin list_view
The reason for the regression was that the GenericForeignKey field isn't
something meta.get_field_by_name() should return. The reason is that a
couple of places in Django expects get_field_by_name() to work this way.
It could make sense to return GFKs from get_field_by_name(), but that
should likely be done as part of meta refactoring or virtual fields
refactoring patches.
Thanks to glicerinu@gmail.com for the report and to Tim for working on
the issue.
Diffstat (limited to 'tests/admin_views/admin.py')
| -rw-r--r-- | tests/admin_views/admin.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/tests/admin_views/admin.py b/tests/admin_views/admin.py index caae88dac5..cb72d1b35b 100644 --- a/tests/admin_views/admin.py +++ b/tests/admin_views/admin.py @@ -35,7 +35,7 @@ from .models import (Article, Chapter, Child, Parent, Picture, Widget, UnchangeableObject, UserMessenger, Simple, Choice, ShortMessage, Telegram, FilteredManager, EmptyModelHidden, EmptyModelVisible, EmptyModelMixin, State, City, Restaurant, Worker, ParentWithDependentChildren, - DependentChild, StumpJoke, FieldOverridePost) + DependentChild, StumpJoke, FieldOverridePost, FunkyTag) def callable_year(dt_value): @@ -821,6 +821,10 @@ class RestaurantAdmin(admin.ModelAdmin): return {'name': 'overridden_value'} +class FunkyTagAdmin(admin.ModelAdmin): + list_display = ('name', 'content_object') + + site = admin.AdminSite(name="admin") site.register(Article, ArticleAdmin) site.register(CustomArticle, CustomArticleAdmin) @@ -876,6 +880,7 @@ site.register(State, StateAdmin) site.register(City, CityAdmin) site.register(Restaurant, RestaurantAdmin) site.register(Worker, WorkerAdmin) +site.register(FunkyTag, FunkyTagAdmin) # We intentionally register Promo and ChapterXtra1 but not Chapter nor ChapterXtra2. # That way we cover all four cases: |
