mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-07-24 21:54:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Fixed #21201 -- Improved customization of ClearableFileInput.

Browse source
This commit is contained in:
Vlastimil Zíma 2013-10-25 09:13:00 +02:00 • committed by Tim Graham
parent 045b8d3267
commit e622caaa85
3 changed files with 35 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

25
django/forms/widgets.py
View file

@ -341,12 +341,10 @@ class ClearableFileInput(FileInput):
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
@ -360,6 +358,21 @@ class ClearableFileInput(FileInput):
"""
return name + '_id'
def is_initial(self, value):
"""
Return whether value is considered to be initial value.
"""
return bool(value and hasattr(value, 'url'))
def get_template_substitution_values(self, value):
"""
Return 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,
@ -370,11 +383,9 @@ class ClearableFileInput(FileInput):
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.get_template_substitution_values(value))
if not self.is_required:
checkbox_name = self.clear_checkbox_name(name)
checkbox_id = self.clear_checkbox_id(checkbox_name)