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

diff --git a/apps/wiki/forms.py b/apps/wiki/forms.py
index 394b823b..d526bfc6 100644
--- a/apps/wiki/forms.py
+++ b/apps/wiki/forms.py
@@ -7,6 +7,7 @@ from django import forms
 from django.utils.translation import ugettext_lazy as _
 
 from catalogue.models import Chunk
+from catalogue.xml_tools import remove_empty_elements
 
 
 class DocumentPubmarkForm(forms.Form):
@@ -15,8 +16,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)
 
 
@@ -46,7 +46,7 @@ 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."),
@@ -59,13 +59,57 @@ 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')
-        r = super(DocumentTextSaveForm, self).__init__(*args, **kwargs)
-        if user and user.is_authenticated():
+        self.user = kwargs.pop('user')
+        self.chunk = kwargs.pop('chunk')
+        super(DocumentTextSaveForm, self).__init__(*args, **kwargs)
+        if self.user and self.user.is_authenticated():
             self.fields['author_name'].required = False
             self.fields['author_email'].required = False
-        return r
+        self.fields['for_cybernauts'].initial = self.chunk.book.for_cybernauts
+        self.fields['publishable'].initial = self.chunk.head.publishable
+
+    def clean_text(self):
+        text = self.cleaned_data.get('text', '')
+        # remove_empty_elements returns None on SyntaxError or when there's no change
+        return remove_empty_elements(text) or text
+
+    def save(self):
+        if self.user.is_authenticated():
+            author = self.user
+        else:
+            author = None
+        text = self.cleaned_data['text']
+        parent_revision = self.cleaned_data['parent_revision']
+        if parent_revision is not None:
+            parent = self.chunk.at_revision(parent_revision)
+        else:
+            parent = None
+        stage = self.cleaned_data['stage_completed']
+        tags = [stage] if stage else []
+        publishable = self.cleaned_data['publishable'] and self.user.has_perm('catalogue.can_pubmark')
+        self.chunk.commit(
+            author=author,
+            text=text,
+            parent=parent,
+            description=self.cleaned_data['comment'],
+            tags=tags,
+            author_name=self.cleaned_data['author_name'],
+            author_email=self.cleaned_data['author_email'],
+            publishable=publishable)
+        self.chunk.book.for_cybernauts = self.cleaned_data['for_cybernauts']
+        self.chunk.book.save()
 
 
 class DocumentTextRevertForm(forms.Form):
@@ -92,7 +136,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."),