X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/d05a1d784f2f0dbad6839c672cae8226d1b0fa9d..56020b3bae83dac682be9635536d138edad22f9d:/apps/wiki/forms.py?ds=sidebyside

diff --git a/apps/wiki/forms.py b/apps/wiki/forms.py
index 3ef3ed14..4f5f7aa4 100644
--- a/apps/wiki/forms.py
+++ b/apps/wiki/forms.py
@@ -4,20 +4,11 @@
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 from django import forms
+from django.core.exceptions import ValidationError
 from django.utils.translation import ugettext_lazy as _
 
-from catalogue.models import Chunk
-
-
-class DocumentPubmarkForm(forms.Form):
-    """
-        Form for marking revisions for publishing.
-    """
-
-    id = forms.CharField(widget=forms.HiddenInput)
-    publishable = forms.BooleanField(required=False, initial=True,
-            label=_('Publishable'))
-    revision = forms.IntegerField(widget=forms.HiddenInput)
+from catalogue.constants import STAGES
+from librarian.document import Document
 
 
 class DocumentTextSaveForm(forms.Form):
@@ -26,7 +17,7 @@ class DocumentTextSaveForm(forms.Form):
 
         * parent_revision - revision which the modified text originated from.
         * comment - user's verbose comment; will be used in commit.
-        * stage_completed - mark this change as end of given stage.
+        * stage - change to this stage
 
     """
 
@@ -46,31 +37,49 @@ class DocumentTextSaveForm(forms.Form):
     )
 
     comment = forms.CharField(
-        required=True,
+        required=False,
         widget=forms.Textarea,
         label=_(u"Your comments"),
         help_text=_(u"Describe changes you made."),
     )
 
-    stage_completed = forms.ModelChoiceField(
-        queryset=Chunk.tag_model.objects.all(),
+    stage = forms.ChoiceField(
+        choices=[(s, s) for s in STAGES],
         required=False,
-        label=_(u"Completed"),
-        help_text=_(u"If you completed a life cycle stage, select it."),
-    )
-
-    publishable = forms.BooleanField(required=False, initial=False,
-        label=_('Publishable'),
-        help_text=_(u"Mark this revision as publishable.")
+        label=_(u"Stage"),
+        help_text=_(u"If completed a work stage, change to another one."),
     )
 
     def __init__(self, *args, **kwargs):
         user = kwargs.pop('user')
-        r = super(DocumentTextSaveForm, self).__init__(*args, **kwargs)
+        super(DocumentTextSaveForm, self).__init__(*args, **kwargs)
         if user and user.is_authenticated():
             self.fields['author_name'].required = False
             self.fields['author_email'].required = False
-        return r
+
+    def clean_text(self):
+        text = self.cleaned_data['text']
+        try:
+            doc = Document.from_string(text)
+        except ValueError as e:
+            raise ValidationError(e.message)
+
+        from librarian import SSTNS, DCNS
+        root_elem = doc.edoc.getroot()
+        if len(root_elem) < 1 or root_elem[0].tag != SSTNS('metadata'):
+            raise ValidationError("The first tag in section should be metadata")
+        if len(root_elem) < 2 or root_elem[1].tag != SSTNS('header'):
+            raise ValidationError("The first tag after metadata should be header")
+        header = root_elem[1]
+        if not getattr(header, 'text', None) or not header.text.strip():
+            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.')
+        return text
 
 
 class DocumentTextRevertForm(forms.Form):
@@ -97,8 +106,12 @@ class DocumentTextRevertForm(forms.Form):
     )
 
     comment = forms.CharField(
-        required=True,
+        required=False,
         widget=forms.Textarea,
         label=_(u"Your comments"),
         help_text=_(u"Describe the reason for reverting."),
     )
+
+
+class DocumentTextPublishForm(forms.Form):
+    revision = forms.IntegerField(widget=forms.HiddenInput)