From ade54ffa34ddc6c19b26c6ea72b46f73af7b682b Mon Sep 17 00:00:00 2001 From: Alexander Gaevsky Date: Thu, 7 Jan 2016 11:07:15 +0200 Subject: Refs #25165 -- Fixed JSON serialization for add/edit popup in the admin. Forwardport of test in o839d71d8562abe0b245024e55ca1d02a45e58fd from stable/1.9.x (refs #25997). --- tests/admin_views/admin.py | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) (limited to 'tests/admin_views/admin.py') diff --git a/tests/admin_views/admin.py b/tests/admin_views/admin.py index 25502dc6af..dbc77e2f7c 100644 --- a/tests/admin_views/admin.py +++ b/tests/admin_views/admin.py @@ -34,16 +34,16 @@ from .models import ( GenRelReference, Grommet, ImplicitlyGeneratedPK, Ingredient, InlineReference, InlineReferer, Inquisition, Language, Link, MainPrepopulated, ModelWithStringPrimaryKey, NotReferenced, OldSubscriber, - OtherStory, Paper, Parent, ParentWithDependentChildren, Person, Persona, - Picture, Pizza, Plot, PlotDetails, PluggableSearchPerson, Podcast, Post, - PrePopulatedPost, PrePopulatedPostLargeSlug, PrePopulatedSubPost, Promo, - Question, Recipe, Recommendation, Recommender, ReferencedByGenRel, - ReferencedByInline, ReferencedByParent, RelatedPrepopulated, Report, - Reservation, Restaurant, RowLevelChangePermissionModel, Section, - ShortMessage, Simple, Sketch, State, Story, StumpJoke, Subscriber, - SuperVillain, Telegram, Thing, Topping, UnchangeableObject, - UndeletableObject, UnorderedObject, UserMessenger, Villain, Vodcast, - Whatsit, Widget, Worker, WorkHour, + OtherStory, Paper, Parent, ParentWithDependentChildren, ParentWithUUIDPK, + Person, Persona, Picture, Pizza, Plot, PlotDetails, PluggableSearchPerson, + Podcast, Post, PrePopulatedPost, PrePopulatedPostLargeSlug, + PrePopulatedSubPost, Promo, Question, Recipe, Recommendation, Recommender, + ReferencedByGenRel, ReferencedByInline, ReferencedByParent, + RelatedPrepopulated, RelatedWithUUIDPKModel, Report, Reservation, + Restaurant, RowLevelChangePermissionModel, Section, ShortMessage, Simple, + Sketch, State, Story, StumpJoke, Subscriber, SuperVillain, Telegram, Thing, + Topping, UnchangeableObject, UndeletableObject, UnorderedObject, + UserMessenger, Villain, Vodcast, Whatsit, Widget, Worker, WorkHour, ) @@ -949,6 +949,8 @@ site.register(ReferencedByInline) site.register(InlineReferer, InlineRefererAdmin) site.register(ReferencedByGenRel) site.register(GenRelReference) +site.register(ParentWithUUIDPK) +site.register(RelatedWithUUIDPKModel) # We intentionally register Promo and ChapterXtra1 but not Chapter nor ChapterXtra2. # That way we cover all four cases: -- cgit v1.3