Ticket #21201: clearable-file-input.patch

django/forms/widgets.py

@@ -9 +9 @@
 import warnings
 
 from django.conf import settings
+from django.core.files.uploadedfile import UploadedFile
 from django.forms.utils import flatatt, to_current_timezone
 from django.utils.datastructures import MultiValueDict, MergeDict
 from django.utils.html import conditional_escape, format_html
@@ -324 +325 @@
     input_text = ugettext_lazy('Change')
     clear_checkbox_label = ugettext_lazy('Clear')
 
-    template_with_initial = '%(initial_text)s: %(initial)s %(clear_template)s<br />%(input_text)s: %(input)s'
+    template_with_initial = '%(initial_text)s: <a href="%(initial_url)s">%(initial)s</a> %(clear_template)s<br />%(input_text)s: %(input)s'
 
     template_with_clear = '%(clear)s <label for="%(clear_checkbox_id)s">%(clear_checkbox_label)s</label>'
 
-    url_markup_template = '<a href="{0}">{1}</a>'
-
     def clear_checkbox_name(self, name):
         """
         Given the name of the file input, return the name of the clear checkbox
@@ -343 +342 @@
         """
         return name + '_id'
 
+    def is_initial(self, value):
+        """
+        Returns whether value is considered to be initial value.
+        """
+        return bool(value and hasattr(value, 'url'))
+
+    def value_to_substitutions(self, value):
+        """
+        Returns value-related substitutions.
+        """
+        return  {
+            'initial': conditional_escape(value),
+            'initial_url': conditional_escape(value.url)
+        }
+
     def render(self, name, value, attrs=None):
         substitutions = {
             'initial_text': self.initial_text,
@@ -353 +367 @@
         template = '%(input)s'
         substitutions['input'] = super(ClearableFileInput, self).render(name, value, attrs)
 
-        if value and hasattr(value, "url"):
+        if self.is_initial(value):
             template = self.template_with_initial
-            substitutions['initial'] = format_html(self.url_markup_template,
-                                                   value.url,
-                                                   force_text(value))
+            substitutions.update(self.value_to_substitutions(value))
             if not self.is_required:
                 checkbox_name = self.clear_checkbox_name(name)
                 checkbox_id = self.clear_checkbox_id(checkbox_name)