editor update

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

diff --git a/apps/wiki/forms.py b/apps/wiki/forms.py
index 394b823..010ad72 100644 (file)
--- a/apps/wiki/forms.py
+++ b/apps/wiki/forms.py
@@ -15,8 +15,7 @@ class DocumentPubmarkForm(forms.Form):
     """
 
     id = forms.CharField(widget=forms.HiddenInput)
     """
 
     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)
 
 
     revision = forms.IntegerField(widget=forms.HiddenInput)
 
 


@@ -46,7 +45,7 @@ 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."),


@@ -59,13 +58,25 @@ class DocumentTextSaveForm(forms.Form):
         help_text=_(u"If you completed a life cycle stage, select it."),
     )
 
         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')
     def __init__(self, *args, **kwargs):
         user = kwargs.pop('user')

-        r = super(DocumentTextSaveForm, self).__init__(*args, **kwargs)
+        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
         if user and user.is_authenticated():
             self.fields['author_name'].required = False
             self.fields['author_email'].required = False

-        return r
+        self.fields['for_cybernauts'].initial = chunk.book.for_cybernauts

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


@@ -92,7 +103,7 @@ 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."),