mirror of
https://github.com/django/django.git
synced 2025-03-09 08:52:32 +00:00
Fixed #36032 -- Rendered URLField values as links in the admin.
This commit is contained in:
parent
5851605863
commit
97ee8b82c2
@ -454,6 +454,8 @@ def display_for_field(value, field, empty_value_display, avoid_link=False):
|
||||
return formats.number_format(value)
|
||||
elif isinstance(field, models.FileField) and value and not avoid_link:
|
||||
return format_html('<a href="{}">{}</a>', value.url, value)
|
||||
elif isinstance(field, models.URLField) and value and not avoid_link:
|
||||
return format_html('<a href="{}">{}</a>', value, value)
|
||||
elif isinstance(field, models.JSONField) and value:
|
||||
try:
|
||||
return json.dumps(value, ensure_ascii=False, cls=field.encoder)
|
||||
|
@ -80,6 +80,8 @@ Minor features
|
||||
:ref:`extrabody <extrabody>` for adding custom code before the closing
|
||||
``</body>`` tag.
|
||||
|
||||
* The value of a :class:`~django.db.models.URLField` now renders as a link.
|
||||
|
||||
:mod:`django.contrib.admindocs`
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
|
||||
|
@ -158,8 +158,8 @@ site.register(Parent, NoListDisplayLinksParentAdmin)
|
||||
|
||||
|
||||
class ListDisplayLinksGenreAdmin(admin.ModelAdmin):
|
||||
list_display = ["name", "file"]
|
||||
list_display_links = ["file"]
|
||||
list_display = ["name", "file", "url"]
|
||||
list_display_links = ["file", "url"]
|
||||
|
||||
|
||||
site.register(Genre, ListDisplayLinksGenreAdmin)
|
||||
|
@ -33,6 +33,7 @@ class GrandChild(models.Model):
|
||||
class Genre(models.Model):
|
||||
name = models.CharField(max_length=20)
|
||||
file = models.FileField(upload_to="documents/", blank=True, null=True)
|
||||
url = models.URLField(blank=True, null=True)
|
||||
|
||||
|
||||
class Band(models.Model):
|
||||
|
@ -1059,13 +1059,22 @@ class ChangeListTests(TestCase):
|
||||
|
||||
def test_link_field_display_links(self):
|
||||
self.client.force_login(self.superuser)
|
||||
g = Genre.objects.create(name="Blues", file="documents/blues_history.txt")
|
||||
g = Genre.objects.create(
|
||||
name="Blues",
|
||||
file="documents/blues_history.txt",
|
||||
url="http://blues_history.com",
|
||||
)
|
||||
response = self.client.get(reverse("admin:admin_changelist_genre_changelist"))
|
||||
self.assertContains(
|
||||
response,
|
||||
'<a href="/admin/admin_changelist/genre/%s/change/">'
|
||||
"documents/blues_history.txt</a>" % g.pk,
|
||||
)
|
||||
self.assertContains(
|
||||
response,
|
||||
'<a href="/admin/admin_changelist/genre/%s/change/">'
|
||||
"http://blues_history.com</a>" % g.pk,
|
||||
)
|
||||
|
||||
def test_clear_all_filters_link(self):
|
||||
self.client.force_login(self.superuser)
|
||||
|
@ -157,6 +157,7 @@ class UtilsTests(SimpleTestCase):
|
||||
models.DateField(),
|
||||
models.DecimalField(),
|
||||
models.FloatField(),
|
||||
models.URLField(),
|
||||
models.JSONField(),
|
||||
models.TimeField(),
|
||||
]
|
||||
@ -196,6 +197,14 @@ class UtilsTests(SimpleTestCase):
|
||||
display_value,
|
||||
)
|
||||
|
||||
def test_url_display_for_field(self):
|
||||
model_field = models.URLField()
|
||||
display_value = display_for_field(
|
||||
"http://example.com", model_field, self.empty_value
|
||||
)
|
||||
expected = '<a href="http://example.com">http://example.com</a>'
|
||||
self.assertHTMLEqual(display_value, expected)
|
||||
|
||||
def test_number_formats_display_for_field(self):
|
||||
display_value = display_for_field(
|
||||
12345.6789, models.FloatField(), self.empty_value
|
||||
|
Loading…
x
Reference in New Issue
Block a user