X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/4c48c47d0b84e516114c16ee191359166e93a51c..1c4c468783e5f380324c29ebc3b2c452da8cc2a0:/apps/wiki/forms.py

diff --git a/apps/wiki/forms.py b/apps/wiki/forms.py
index a8a57c88..010ad723 100644
--- a/apps/wiki/forms.py
+++ b/apps/wiki/forms.py
@@ -15,8 +15,7 @@ class DocumentPubmarkForm(forms.Form):
     """
 
     id = forms.CharField(widget=forms.HiddenInput)
-    publishable = forms.BooleanField(required=False, initial=True,
-            label=_('Publishable'))
+    publishable = forms.BooleanField(required=False, initial=True, label=_('Publishable'))
     revision = forms.IntegerField(widget=forms.HiddenInput)
 
 
@@ -30,23 +29,23 @@ class DocumentTextSaveForm(forms.Form):
 
     """
 
-    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."),
@@ -59,6 +58,26 @@ class DocumentTextSaveForm(forms.Form):
         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."))
+
+    for_cybernauts = forms.BooleanField(
+        required=False, initial=False,
+        label=_(u"For Cybernauts"),
+        help_text=_(u"Mark this document for Cybernauts.")
+    )
+
+    def __init__(self, *args, **kwargs):
+        user = kwargs.pop('user')
+        chunk = kwargs.pop('chunk')
+        super(DocumentTextSaveForm, self).__init__(*args, **kwargs)
+        if user and user.is_authenticated():
+            self.fields['author_name'].required = False
+            self.fields['author_email'].required = False
+        self.fields['for_cybernauts'].initial = chunk.book.for_cybernauts
+
 
 class DocumentTextRevertForm(forms.Form):
     """
@@ -84,7 +103,7 @@ 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."),