X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/2f9c60b76f3ab4e69d794a6bb14388a81ff29eb7..27bed5683e1619659c96f6ca58dd42cf49be4c67:/apps/wiki/forms.py

diff --git a/apps/wiki/forms.py b/apps/wiki/forms.py
index a8a57c88..7ef02e15 100644
--- a/apps/wiki/forms.py
+++ b/apps/wiki/forms.py
@@ -6,18 +6,7 @@
 from django import forms
 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
 
 
 class DocumentTextSaveForm(forms.Form):
@@ -26,39 +15,46 @@ 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
 
     """
 
-    parent_revision = forms.IntegerField(widget=forms.HiddenInput)
+    parent_revision = forms.IntegerField(widget=forms.HiddenInput, required=False)
     text = forms.CharField(widget=forms.HiddenInput)
 
     author_name = forms.CharField(
-        required=False,
+        required=True,
         label=_(u"Author"),
         help_text=_(u"Your name"),
     )
 
     author_email = forms.EmailField(
-        required=False,
+        required=True,
         label=_(u"Author's email"),
         help_text=_(u"Your email address, so we can show a gravatar :)"),
     )
 
     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."),
+        label=_(u"Stage"),
+        help_text=_(u"If completed a work stage, change to another one."),
     )
 
+    def __init__(self, *args, **kwargs):
+        user = kwargs.pop('user')
+        super(DocumentTextSaveForm, self).__init__(*args, **kwargs)
+        if user and user.is_authenticated():
+            self.fields['author_name'].required = False
+            self.fields['author_email'].required = False
+
 
 class DocumentTextRevertForm(forms.Form):
     """
@@ -84,8 +80,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)