update librarian

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

diff --git a/apps/wiki/forms.py b/apps/wiki/forms.py
index 394b823..3ea36a3 100644 (file)
--- 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
 # 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 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):
 
 
 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.
 
         * 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,26 +37,33 @@ class DocumentTextSaveForm(forms.Form):
     )
 
     comment = forms.CharField(
     )
 
     comment = forms.CharField(

-        required=True,
+        required=False,

         widget=forms.Textarea,
         label=_(u"Your comments"),
         help_text=_(u"Describe changes you made."),
     )
 
         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,
         required=False,

-        label=_(u"Completed"),
-        help_text=_(u"If you completed a life cycle stage, select it."),
+        label=_(u"Stage"),
+        help_text=_(u"If completed a work stage, change to another one."),

     )
 
     def __init__(self, *args, **kwargs):
         user = kwargs.pop('user')
     )
 
     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
         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:
+            Document.from_string(text)
+        except ValueError as e:
+            raise ValidationError(e.message)
+        return text

 
 
 class DocumentTextRevertForm(forms.Form):
 
 
 class DocumentTextRevertForm(forms.Form):


@@ -92,8 +90,12 @@ class DocumentTextRevertForm(forms.Form):
     )
 
     comment = forms.CharField(
     )
 
     comment = forms.CharField(

-        required=True,
+        required=False,

         widget=forms.Textarea,
         label=_(u"Your comments"),
         help_text=_(u"Describe the reason for reverting."),
     )
         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)