p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Refs #26524 -- Added a test for a <OneToOneField>_id reference in ModelAdmin.list_display.

This commit is contained in:
Jon Dufresne 2016-09-12 19:13:00 -07:00
parent e24c0a2d7c
commit 8b050cf9dc
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tests/admin_views/tests.py
View File

@ -52,9 +52,9 @@ from .models import (
CyclicOne, CyclicTwo, DooHickey, Employee, EmptyModel, ExternalSubscriber, CyclicOne, CyclicTwo, DooHickey, Employee, EmptyModel, ExternalSubscriber,
Fabric, FancyDoodad, FieldOverridePost, FilteredManager, FooAccount, Fabric, FancyDoodad, FieldOverridePost, FilteredManager, FooAccount,
FoodDelivery, FunkyTag, Gallery, Grommet, Inquisition, Language, Link, FoodDelivery, FunkyTag, Gallery, Grommet, Inquisition, Language, Link,
MainPrepopulated, ModelWithStringPrimaryKey, OtherStory, Paper, Parent, MainPrepopulated, Media, ModelWithStringPrimaryKey, OtherStory, Paper,
ParentWithDependentChildren, ParentWithUUIDPK, Person, Persona, Picture, Parent, ParentWithDependentChildren, ParentWithUUIDPK, Person, Persona,
Pizza, Plot, PlotDetails, PluggableSearchPerson, Podcast, Post, Picture, Pizza, Plot, PlotDetails, PluggableSearchPerson, Podcast, Post,
PrePopulatedPost, Promo, Question, Recommendation, Recommender, PrePopulatedPost, Promo, Question, Recommendation, Recommender,
RelatedPrepopulated, RelatedWithUUIDPKModel, Report, Restaurant, RelatedPrepopulated, RelatedWithUUIDPKModel, Report, Restaurant,
RowLevelChangePermissionModel, SecretHideout, Section, ShortMessage, RowLevelChangePermissionModel, SecretHideout, Section, ShortMessage,
@ -539,7 +539,7 @@ class AdminViewBasicTest(AdminViewBasicTestCase):
self.assertContentBefore(response, 'The First Item', 'The Middle Item') self.assertContentBefore(response, 'The First Item', 'The Middle Item')
self.assertContentBefore(response, 'The Middle Item', 'The Last Item') self.assertContentBefore(response, 'The Middle Item', 'The Last Item')
def test_has_related_field_in_list_display(self): def test_has_related_field_in_list_display_fk(self):
"""Joins shouldn't be performed for <FK>_id fields in list display.""" """Joins shouldn't be performed for <FK>_id fields in list display."""
state = State.objects.create(name='Karnataka') state = State.objects.create(name='Karnataka')
City.objects.create(state=state, name='Bangalore') City.objects.create(state=state, name='Bangalore')
@ -551,6 +551,18 @@ class AdminViewBasicTest(AdminViewBasicTestCase):
response.context['cl'].list_display = ['id', 'name', 'state_id'] response.context['cl'].list_display = ['id', 'name', 'state_id']
self.assertIs(response.context['cl'].has_related_field_in_list_display(), False) self.assertIs(response.context['cl'].has_related_field_in_list_display(), False)
def test_has_related_field_in_list_display_o2o(self):
"""Joins shouldn't be performed for <O2O>_id fields in list display."""
media = Media.objects.create(name='Foo')
Vodcast.objects.create(media=media)
response = self.client.get(reverse('admin:admin_views_vodcast_changelist'), {})
response.context['cl'].list_display = ['media']
self.assertIs(response.context['cl'].has_related_field_in_list_display(), True)
response.context['cl'].list_display = ['media_id']
self.assertIs(response.context['cl'].has_related_field_in_list_display(), False)
def test_limited_filter(self): def test_limited_filter(self):
"""Ensure admin changelist filters do not contain objects excluded via limit_choices_to. """Ensure admin changelist filters do not contain objects excluded via limit_choices_to.
This also tests relation-spanning filters (e.g. 'color__value'). This also tests relation-spanning filters (e.g. 'color__value').