From ade54ffa34ddc6c19b26c6ea72b46f73af7b682b Mon Sep 17 00:00:00 2001 From: Alexander Gaevsky Date: Thu, 7 Jan 2016 11:07:15 +0200 Subject: [PATCH] Refs #25165 -- Fixed JSON serialization for add/edit popup in the admin. Forwardport of test in o839d71d8562abe0b245024e55ca1d02a45e58fd from stable/1.9.x (refs #25997). --- django/contrib/admin/options.py | 4 ++-- docs/releases/1.9.2.txt | 4 ++++ tests/admin_views/admin.py | 22 ++++++++++++---------- tests/admin_views/models.py | 13 +++++++++++++ tests/admin_views/tests.py | 32 ++++++++++++++++++++++++-------- 5 files changed, 55 insertions(+), 20 deletions(-) diff --git a/django/contrib/admin/options.py b/django/contrib/admin/options.py index 8b0af2b78d..a09c958282 100644 --- a/django/contrib/admin/options.py +++ b/django/contrib/admin/options.py @@ -1135,9 +1135,9 @@ class ModelAdmin(BaseModelAdmin): new_value = obj.serializable_value(attr) popup_response_data = json.dumps({ 'action': 'change', - 'value': value, + 'value': six.text_type(value), 'obj': six.text_type(obj), - 'new_value': new_value, + 'new_value': six.text_type(new_value), }) return SimpleTemplateResponse('admin/popup_response.html', { 'popup_response_data': popup_response_data, diff --git a/docs/releases/1.9.2.txt b/docs/releases/1.9.2.txt index 375fe3edaa..ffe5030d9e 100644 --- a/docs/releases/1.9.2.txt +++ b/docs/releases/1.9.2.txt @@ -21,3 +21,7 @@ Bugfixes * Fixed a regression that caused the incorrect day to be selected when opening the admin calendar widget for timezones from GMT+0100 to GMT+1200 (:ticket:`24980`). + +* Fixed a regression in the admin's edit related model popup that caused an + escaped value to be displayed in the select dropdown of the parent window + (:ticket:`25997`). 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: diff --git a/tests/admin_views/models.py b/tests/admin_views/models.py index aa4476c9ed..5411885ee9 100644 --- a/tests/admin_views/models.py +++ b/tests/admin_views/models.py @@ -4,6 +4,7 @@ from __future__ import unicode_literals import datetime import os import tempfile +import uuid from django.contrib.auth.models import User from django.contrib.contenttypes.fields import ( @@ -956,3 +957,15 @@ class ReferencedByGenRel(models.Model): class GenRelReference(models.Model): references = GenericRelation(ReferencedByGenRel) + + +class ParentWithUUIDPK(models.Model): + id = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False) + title = models.CharField(max_length=100) + + def __str__(self): + return str(self.id) + + +class RelatedWithUUIDPKModel(models.Model): + parent = models.ForeignKey(ParentWithUUIDPK, on_delete=models.CASCADE) diff --git a/tests/admin_views/tests.py b/tests/admin_views/tests.py index 49afb860c5..7f94358fec 100644 --- a/tests/admin_views/tests.py +++ b/tests/admin_views/tests.py @@ -52,14 +52,14 @@ from .models import ( Fabric, FancyDoodad, FieldOverridePost, FilteredManager, FooAccount, FoodDelivery, FunkyTag, Gallery, Grommet, Inquisition, Language, Link, MainPrepopulated, ModelWithStringPrimaryKey, OtherStory, Paper, Parent, - ParentWithDependentChildren, Person, Persona, Picture, Pizza, Plot, - PlotDetails, PluggableSearchPerson, Podcast, Post, PrePopulatedPost, Promo, - Question, Recommendation, Recommender, RelatedPrepopulated, Report, - Restaurant, RowLevelChangePermissionModel, SecretHideout, Section, - ShortMessage, Simple, State, Story, Subscriber, SuperSecretHideout, - SuperVillain, Telegram, TitleTranslation, Topping, UnchangeableObject, - UndeletableObject, UnorderedObject, Villain, Vodcast, Whatsit, Widget, - Worker, WorkHour, + ParentWithDependentChildren, ParentWithUUIDPK, Person, Persona, Picture, + Pizza, Plot, PlotDetails, PluggableSearchPerson, Podcast, Post, + PrePopulatedPost, Promo, Question, Recommendation, Recommender, + RelatedPrepopulated, RelatedWithUUIDPKModel, Report, Restaurant, + RowLevelChangePermissionModel, SecretHideout, Section, ShortMessage, + Simple, State, Story, Subscriber, SuperSecretHideout, SuperVillain, + Telegram, TitleTranslation, Topping, UnchangeableObject, UndeletableObject, + UnorderedObject, Villain, Vodcast, Whatsit, Widget, Worker, WorkHour, ) @@ -4515,6 +4515,22 @@ class SeleniumAdminViewsFirefoxTests(AdminSeleniumWebDriverTestCase): select = Select(self.selenium.find_element_by_id('id_form-0-section')) self.assertEqual(select.first_selected_option.text, 'new section') + def test_inline_uuid_pk_edit_with_popup(self): + from selenium.webdriver.support.ui import Select + parent = ParentWithUUIDPK.objects.create(title='test') + related_with_parent = RelatedWithUUIDPKModel.objects.create(parent=parent) + self.admin_login(username='super', password='secret', login_url=reverse('admin:index')) + change_url = reverse('admin:admin_views_relatedwithuuidpkmodel_change', args=(related_with_parent.id,)) + self.selenium.get(self.live_server_url + change_url) + self.selenium.find_element_by_id('change_id_parent').click() + self.wait_for_popup() + self.selenium.switch_to.window(self.selenium.window_handles[-1]) + self.selenium.find_element_by_xpath('//input[@value="Save"]').click() + self.selenium.switch_to.window(self.selenium.window_handles[0]) + select = Select(self.selenium.find_element_by_id('id_parent')) + self.assertEqual(select.first_selected_option.text, str(parent.id)) + self.assertEqual(select.first_selected_option.get_attribute('value'), str(parent.id)) + class SeleniumAdminViewsChromeTests(SeleniumAdminViewsFirefoxTests): webdriver_class = 'selenium.webdriver.chrome.webdriver.WebDriver'