From 05eeada23bd7065bf750e88c4c3125676e9ace92 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Tue, 27 Feb 2018 15:47:32 +0100 Subject: Allow no resizing of images (by explicit parameter in settings) --- ishtar_common/forms_common.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'ishtar_common/forms_common.py') diff --git a/ishtar_common/forms_common.py b/ishtar_common/forms_common.py index f01c3e4b8..940ce99b8 100644 --- a/ishtar_common/forms_common.py +++ b/ishtar_common/forms_common.py @@ -870,6 +870,15 @@ class MergeOrganizationForm(MergeForm): TO_KEY = 'to_organization' +def get_image_help(): + if not settings.IMAGE_MAX_SIZE: + return "" + return _(u"

Heavy images are resized to: %(width)dx%(height)d " + u"(ratio is preserved).

") \ + % {'width': settings.IMAGE_MAX_SIZE[0], + 'height': settings.IMAGE_MAX_SIZE[1]} + + ###################### # Sources management # ###################### @@ -908,11 +917,7 @@ class SourceForm(CustomForm, ManageOldType): duplicate = forms.BooleanField(label=_(u"Has a duplicate"), required=False) image = forms.ImageField( - label=_(u"Image"), help_text=mark_safe( - _(u"

Heavy images are resized to: %(width)dx%(height)d " - u"(ratio is preserved).

") % { - 'width': settings.IMAGE_MAX_SIZE[0], - 'height': settings.IMAGE_MAX_SIZE[1]}), + label=_(u"Image"), help_text=mark_safe(get_image_help()), max_length=255, required=False, widget=widgets.ImageFileInput()) TYPES = [ -- cgit v1.2.3