X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/a7ef44e7769429470cbf5c8708be37f6ca098ab3..92adaf4060fa5f65bfd8022ec03ebe94311f4552:/apps/wiki/forms.py?ds=sidebyside

diff --git a/apps/wiki/forms.py b/apps/wiki/forms.py
index 394b823b..bee0e192 100644
--- a/apps/wiki/forms.py
+++ b/apps/wiki/forms.py
@@ -6,18 +6,8 @@
 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.models import Document
+from catalogue.constants import STAGES
 
 
 class DocumentTextSaveForm(forms.Form):
@@ -26,7 +16,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,17 +36,17 @@ 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."),
+        label=_(u"Stage"),
+        help_text=_(u"If completed a work stage, change to another one."),
     )
 
     def __init__(self, *args, **kwargs):
@@ -92,8 +82,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)