diff options
Diffstat (limited to 'tests/admin_views')
| -rw-r--r-- | tests/admin_views/admin.py | 9 | ||||
| -rw-r--r-- | tests/admin_views/models.py | 9 | ||||
| -rw-r--r-- | tests/admin_views/tests.py | 54 |
3 files changed, 63 insertions, 9 deletions
diff --git a/tests/admin_views/admin.py b/tests/admin_views/admin.py index 44623e483f..4a72e3070f 100644 --- a/tests/admin_views/admin.py +++ b/tests/admin_views/admin.py @@ -37,8 +37,8 @@ from .models import ( Person, Persona, Picture, Pizza, Plot, PlotDetails, PlotProxy, PluggableSearchPerson, Podcast, Post, PrePopulatedPost, PrePopulatedPostLargeSlug, PrePopulatedSubPost, Promo, Question, - ReadablePizza, ReadOnlyPizza, Recipe, Recommendation, Recommender, - ReferencedByGenRel, ReferencedByInline, ReferencedByParent, + ReadablePizza, ReadOnlyPizza, ReadOnlyRelatedField, Recipe, Recommendation, + Recommender, ReferencedByGenRel, ReferencedByInline, ReferencedByParent, RelatedPrepopulated, RelatedWithUUIDPKModel, Report, Reservation, Restaurant, RowLevelChangePermissionModel, Section, ShortMessage, Simple, Sketch, Song, State, Story, StumpJoke, Subscriber, SuperVillain, Telegram, @@ -539,6 +539,10 @@ class PizzaAdmin(admin.ModelAdmin): readonly_fields = ('toppings',) +class ReadOnlyRelatedFieldAdmin(admin.ModelAdmin): + readonly_fields = ('chapter', 'language', 'user') + + class StudentAdmin(admin.ModelAdmin): search_fields = ('name',) @@ -1061,6 +1065,7 @@ site.register(GenRelReference) site.register(ParentWithUUIDPK) site.register(RelatedPrepopulated, search_fields=['name']) site.register(RelatedWithUUIDPKModel) +site.register(ReadOnlyRelatedField, ReadOnlyRelatedFieldAdmin) # We intentionally register Promo and ChapterXtra1 but not Chapter nor ChapterXtra2. # That way we cover all four cases: diff --git a/tests/admin_views/models.py b/tests/admin_views/models.py index ba818ea10e..eed3cae306 100644 --- a/tests/admin_views/models.py +++ b/tests/admin_views/models.py @@ -365,6 +365,9 @@ class Language(models.Model): english_name = models.CharField(max_length=50) shortlist = models.BooleanField(default=False) + def __str__(self): + return self.iso + class Meta: ordering = ('iso',) @@ -999,3 +1002,9 @@ class UserProxy(User): """Proxy a model with a different app_label.""" class Meta: proxy = True + + +class ReadOnlyRelatedField(models.Model): + chapter = models.ForeignKey(Chapter, models.CASCADE) + language = models.ForeignKey(Language, models.CASCADE) + user = models.ForeignKey(User, models.CASCADE) diff --git a/tests/admin_views/tests.py b/tests/admin_views/tests.py index 6842b02d3e..94646f2034 100644 --- a/tests/admin_views/tests.py +++ b/tests/admin_views/tests.py @@ -48,12 +48,12 @@ from .models import ( Parent, ParentWithDependentChildren, ParentWithUUIDPK, Person, Persona, Picture, Pizza, Plot, PlotDetails, PluggableSearchPerson, Podcast, Post, PrePopulatedPost, Promo, Question, ReadablePizza, ReadOnlyPizza, - Recommendation, Recommender, RelatedPrepopulated, RelatedWithUUIDPKModel, - Report, Restaurant, RowLevelChangePermissionModel, SecretHideout, Section, - ShortMessage, Simple, Song, State, Story, SuperSecretHideout, SuperVillain, - Telegram, TitleTranslation, Topping, UnchangeableObject, UndeletableObject, - UnorderedObject, UserProxy, Villain, Vodcast, Whatsit, Widget, Worker, - WorkHour, + ReadOnlyRelatedField, Recommendation, Recommender, RelatedPrepopulated, + RelatedWithUUIDPKModel, Report, Restaurant, RowLevelChangePermissionModel, + SecretHideout, Section, ShortMessage, Simple, Song, State, Story, + SuperSecretHideout, SuperVillain, Telegram, TitleTranslation, Topping, + UnchangeableObject, UndeletableObject, UnorderedObject, UserProxy, Villain, + Vodcast, Whatsit, Widget, Worker, WorkHour, ) ERROR_MESSAGE = "Please enter the correct username and password \ @@ -5042,6 +5042,45 @@ class ReadonlyTest(AdminFieldExtractionMixin, TestCase): response = self.client.get(reverse('admin:admin_views_choice_change', args=(choice.pk,))) self.assertContains(response, '<div class="readonly">No opinion</div>', html=True) + def test_readonly_foreignkey_links(self): + """ + ForeignKey readonly fields render as links if the target model is + registered in admin. + """ + chapter = Chapter.objects.create( + title='Chapter 1', + content='content', + book=Book.objects.create(name='Book 1'), + ) + language = Language.objects.create(iso='_40', name='Test') + obj = ReadOnlyRelatedField.objects.create( + chapter=chapter, + language=language, + user=self.superuser, + ) + response = self.client.get( + reverse('admin:admin_views_readonlyrelatedfield_change', args=(obj.pk,)), + ) + # Related ForeignKey object registered in admin. + user_url = reverse('admin:auth_user_change', args=(self.superuser.pk,)) + self.assertContains( + response, + '<div class="readonly"><a href="%s">super</a></div>' % user_url, + html=True, + ) + # Related ForeignKey with the string primary key registered in admin. + language_url = reverse( + 'admin:admin_views_language_change', + args=(quote(language.pk),), + ) + self.assertContains( + response, + '<div class="readonly"><a href="%s">_40</a></div>' % language_url, + html=True, + ) + # Related ForeignKey object not registered in admin. + self.assertContains(response, '<div class="readonly">Chapter 1</div>', html=True) + def test_readonly_manytomany_backwards_ref(self): """ Regression test for #16433 - backwards references for related objects @@ -5071,7 +5110,8 @@ class ReadonlyTest(AdminFieldExtractionMixin, TestCase): response = self.client.get(reverse('admin:admin_views_plotproxy_change', args=(pl.pk,))) field = self.get_admin_readonly_field(response, 'plotdetails') - self.assertEqual(field.contents(), 'Brand New Plot') + pd_url = reverse('admin:admin_views_plotdetails_change', args=(pd.pk,)) + self.assertEqual(field.contents(), '<a href="%s">Brand New Plot</a>' % pd_url) # The reverse relation also works if the OneToOneField is null. pd.plot = None |