diff options
| author | Collin Anderson <cmawebsite@gmail.com> | 2015-02-11 11:40:03 -0500 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2015-02-11 13:01:25 -0500 |
| commit | 343c0875338128dad162d4806fe908fb31404d14 (patch) | |
| tree | 015974a91ea238292900af0bcec810c09b1c2304 | |
| parent | e06971340d6a8c1eb41588d8c5fb3cacac798ab3 (diff) | |
[1.8.x] Refs #14497 -- Handled empty readonly admin FileFields
Backport of 07cfe1bd822f4108b5029aef1615a17000d0b0dc from master
| -rw-r--r-- | django/contrib/admin/utils.py | 2 | ||||
| -rw-r--r-- | tests/admin_widgets/tests.py | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/django/contrib/admin/utils.py b/django/contrib/admin/utils.py index f704ef3af7..00d8b41129 100644 --- a/django/contrib/admin/utils.py +++ b/django/contrib/admin/utils.py @@ -388,7 +388,7 @@ def display_for_field(value, field): return formats.number_format(value, field.decimal_places) elif isinstance(field, models.FloatField): return formats.number_format(value) - elif isinstance(field, models.FileField): + elif isinstance(field, models.FileField) and value: return mark_safe('<a href="%s">%s</a>' % ( conditional_escape(value.url), conditional_escape(value), diff --git a/tests/admin_widgets/tests.py b/tests/admin_widgets/tests.py index 8d74f0b53c..6838a12b4d 100644 --- a/tests/admin_widgets/tests.py +++ b/tests/admin_widgets/tests.py @@ -397,6 +397,12 @@ class AdminFileWidgetTests(DjangoTestCase): '<input type="file" name="cover_art" id="id_cover_art" />', html=True, ) + response = self.client.get(reverse('admin:admin_widgets_album_add')) + self.assertContains( + response, + '<p></p>', + html=True, + ) @override_settings(ROOT_URLCONF='admin_widgets.urls') |