mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-24 14:16:09 +00:00
Code Issues 32 Releases Wiki Activity

Fixed #24851 -- Fixed crash with reverse one-to-one relation in ModelAdmin.list_display

Browse Source 
Forwardport of 2456276b02 from stable/1.8.x
This commit is contained in:
Tim Graham
2015-05-27 11:43:22 -04:00
parent 80ad5472ce
commit ad0f0daf8c
5 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
tests/admin_changelist/tests.py
View File

@@ -27,7 +27,7 @@ from .admin import (
from .models import (
Band, Child, ChordsBand, ChordsMusician, Concert, CustomIdUser, Event,
Genre, Group, Invitation, Membership, Musician, OrderedObject, Parent,
Quartet, Swallow, UnorderedObject,
Quartet, Swallow, SwallowOneToOne, UnorderedObject,
)
@@ -547,8 +547,10 @@ class ChangeListTests(TestCase):
Regression test for #17128
(ChangeList failing under Python 2.5 after r16319)
"""
swallow = Swallow.objects.create(
origin='Africa', load='12.34', speed='22.2')
swallow = Swallow.objects.create(origin='Africa', load='12.34', speed='22.2')
swallow2 = Swallow.objects.create(origin='Africa', load='12.34', speed='22.2')
swallow_o2o = SwallowOneToOne.objects.create(swallow=swallow2)
model_admin = SwallowAdmin(Swallow, custom_site)
superuser = self._create_superuser('superuser')
request = self._mocked_authenticated_request('/swallow/', superuser)
@@ -557,6 +559,9 @@ class ChangeListTests(TestCase):
self.assertContains(response, six.text_type(swallow.origin))
self.assertContains(response, six.text_type(swallow.load))
self.assertContains(response, six.text_type(swallow.speed))
# Reverse one-to-one relations should work.
self.assertContains(response, '<td class="field-swallowonetoone">-</td>')
self.assertContains(response, '<td class="field-swallowonetoone">%s</td>' % swallow_o2o)
def test_deterministic_order_for_unordered_model(self):
"""