diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-09-05 20:09:46 +0200 | 
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-09-05 20:09:46 +0200 | 
| commit | 6d53f660453552414207a711cef2cad2f09bf8d3 (patch) | |
| tree | da14d18d48ba4c5217f466ade0aad79c40bb3bca /ishtar_common/forms_common.py | |
| parent | 4190b4a7dc03c0b9f1ca4113b4d0706c1bfffa19 (diff) | |
| parent | edfe798c15c8589933cb41314d01ff73a8d7c0c8 (diff) | |
| download | Ishtar-6d53f660453552414207a711cef2cad2f09bf8d3.tar.bz2 Ishtar-6d53f660453552414207a711cef2cad2f09bf8d3.zip  | |
Merge branch 'master' into v0.9
Diffstat (limited to 'ishtar_common/forms_common.py')
| -rw-r--r-- | ishtar_common/forms_common.py | 8 | 
1 files changed, 8 insertions, 0 deletions
diff --git a/ishtar_common/forms_common.py b/ishtar_common/forms_common.py index f6889ae1f..2788283db 100644 --- a/ishtar_common/forms_common.py +++ b/ishtar_common/forms_common.py @@ -649,6 +649,7 @@ class MergeOrganizationForm(MergeForm):  ######################  class SourceForm(ManageOldType, forms.Form):      form_label = _(u"Documentation informations") +    file_upload = True      associated_models = {'source_type': models.SourceType}      title = forms.CharField(label=_(u"Title"),                              validators=[validators.MaxLengthValidator(200)]) @@ -677,6 +678,13 @@ class SourceForm(ManageOldType, forms.Form):          required=False)      duplicate = forms.BooleanField(label=_(u"Has a duplicate"),                                     required=False) +    image = forms.ImageField( +        label=_(u"Image"), help_text=mark_safe( +            _(u"<p>Heavy images are resized to: %(width)dx%(height)d " +              u"(ratio is preserved).</p>") % { +                'width': settings.IMAGE_MAX_SIZE[0], +                'height': settings.IMAGE_MAX_SIZE[1]}), +        required=False, widget=widgets.ImageFileInput())      def __init__(self, *args, **kwargs):          super(SourceForm, self).__init__(*args, **kwargs)  | 
