tags in editor metadata window

[redakcja.git] / apps / wiki / forms.py

diff --git a/apps/wiki/forms.py b/apps/wiki/forms.py
index 4f5f7aa..c2cb0ee 100644 (file)
--- a/apps/wiki/forms.py
+++ b/apps/wiki/forms.py
@@ -44,7 +44,7 @@ class DocumentTextSaveForm(forms.Form):
     )
 
     stage = forms.ChoiceField(
     )
 
     stage = forms.ChoiceField(

-        choices=[(s, s) for s in STAGES],
+        choices=STAGES,

         required=False,
         label=_(u"Stage"),
         help_text=_(u"If completed a work stage, change to another one."),
         required=False,
         label=_(u"Stage"),
         help_text=_(u"If completed a work stage, change to another one."),


@@ -75,10 +75,12 @@ class DocumentTextSaveForm(forms.Form):
             raise ValidationError(
                 "The first header should contain the title in plain text (no links, emphasis etc.) and cannot be empty")
 
             raise ValidationError(
                 "The first header should contain the title in plain text (no links, emphasis etc.) and cannot be empty")
 

-        ext = doc.meta.get_one(DCNS('relation.coverimage.url')).rsplit('.', 1)[-1].lower()
-        if ext not in ('jpg', 'jpeg', 'png', 'gif', 'tif', 'tiff'):
-            raise ValidationError('Invalid cover image format, should be an image file (jpg, png, gif). '
-                                  'Change it in Metadata.')
+        cover_url = doc.meta.get_one(DCNS('relation.coverimage.url'))
+        if cover_url:
+            ext = cover_url.rsplit('.', 1)[-1].lower()
+            if ext not in ('jpg', 'jpeg', 'png', 'gif', 'svg'):
+                raise ValidationError('Invalid cover image format, should be an image file (jpg, png, gif, svg). '
+                                      'Change it in Metadata.')

         return text
 
 
         return text