1
0
mirror of https://github.com/django/django.git synced 2025-10-31 09:41:08 +00:00

Fixed #35330 -- Fixed the update of related widgets when the referenced model is camel case named.

Co-authored-by: Natalia <124304+nessita@users.noreply.github.com>
This commit is contained in:
devin13cox
2024-04-02 18:00:25 -07:00
committed by GitHub
parent 888b9042b3
commit 8665cf03d7
6 changed files with 86 additions and 1 deletions

View File

@@ -33,6 +33,8 @@ from .models import (
Book,
Bookmark,
Box,
CamelCaseModel,
CamelCaseRelatedModel,
Category,
Chapter,
ChapterXtra1,
@@ -1181,6 +1183,10 @@ class SquareAdmin(admin.ModelAdmin):
readonly_fields = ("area",)
class CamelCaseAdmin(admin.ModelAdmin):
filter_horizontal = ["m2m"]
site = admin.AdminSite(name="admin")
site.site_url = "/my-site-url/"
site.register(Article, ArticleAdmin)
@@ -1305,6 +1311,8 @@ site.register(Box)
site.register(Country, CountryAdmin)
site.register(Traveler, TravelerAdmin)
site.register(Square, SquareAdmin)
site.register(CamelCaseModel)
site.register(CamelCaseRelatedModel, CamelCaseAdmin)
# Register core models we need in our tests
site.register(User, UserAdmin)

View File

@@ -1155,3 +1155,15 @@ class Square(models.Model):
class Meta:
required_db_features = {"supports_stored_generated_columns"}
class CamelCaseModel(models.Model):
interesting_name = models.CharField(max_length=100)
def __str__(self):
return self.interesting_name
class CamelCaseRelatedModel(models.Model):
m2m = models.ManyToManyField(CamelCaseModel, related_name="m2m")
fk = models.ForeignKey(CamelCaseModel, on_delete=models.CASCADE, related_name="fk")

View File

@@ -76,3 +76,45 @@ class SeleniumTests(AdminSeleniumTestCase):
with self.subTest(link_id):
link = self.selenium.find_element(By.XPATH, f'//*[@id="{link_id}"]')
self.assertIsNone(link.get_attribute("aria-disabled"))
def test_related_object_update_with_camel_casing(self):
from selenium.webdriver.common.by import By
def _get_HTML_inside_element_by_id(id_):
return self.selenium.find_element(By.ID, id_).get_attribute("innerHTML")
add_url = reverse("admin:admin_views_camelcaserelatedmodel_add")
self.selenium.get(self.live_server_url + add_url)
interesting_name = "A test name"
# Add a new CamelCaseModel using the "+" icon next to the "fk" field.
self.selenium.find_element(By.ID, "add_id_fk").click()
# Switch to the add popup window.
self.wait_for_and_switch_to_popup()
# Find the "interesting_name" field and enter a value, then save it.
self.selenium.find_element(By.ID, "id_interesting_name").send_keys(
interesting_name
)
self.selenium.find_element(By.NAME, "_save").click()
# Return to the main window.
self.wait_until(lambda d: len(d.window_handles) == 1, 1)
self.selenium.switch_to.window(self.selenium.window_handles[0])
# Check that both the "Available" m2m box and the "Fk" dropdown now
# include the newly added CamelCaseModel instance.
self.assertHTMLEqual(
self.selenium.find_element(By.ID, "id_fk"),
f"""
<option value="" selected="">---------</option>
<option value="1" selected>{interesting_name}</option>
""",
)
self.assertHTMLEqual(
self.selenium.find_element(By.ID, "id_m2m_from"),
f"""
<option value="1">{interesting_name}</option>
""",
)