From: Jan Szejko <janek37@gmail.com>
Date: Wed, 23 Nov 2016 12:30:21 +0000 (+0100)
Subject: refactor text save form
X-Git-Url: https://git.mdrn.pl/redakcja.git/commitdiff_plain/dbf3690fd7b8d30f603f3ef333290c22f4e5d63f

refactor text save form
---

diff --git a/apps/wiki/forms.py b/apps/wiki/forms.py
index 010ad723..08e5aea4 100644
--- a/apps/wiki/forms.py
+++ b/apps/wiki/forms.py
@@ -70,13 +70,39 @@ class DocumentTextSaveForm(forms.Form):
     )
 
     def __init__(self, *args, **kwargs):
-        user = kwargs.pop('user')
-        chunk = kwargs.pop('chunk')
+        self.user = kwargs.pop('user')
+        self.chunk = kwargs.pop('chunk')
         super(DocumentTextSaveForm, self).__init__(*args, **kwargs)
-        if user and user.is_authenticated():
+        if self.user and self.user.is_authenticated():
             self.fields['author_name'].required = False
             self.fields['author_email'].required = False
-        self.fields['for_cybernauts'].initial = chunk.book.for_cybernauts
+        self.fields['for_cybernauts'].initial = self.chunk.book.for_cybernauts
+
+    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):
diff --git a/apps/wiki/views.py b/apps/wiki/views.py
index 7101fc9f..7a561064 100644
--- a/apps/wiki/views.py
+++ b/apps/wiki/views.py
@@ -154,30 +154,8 @@ def text(request, chunk_id):
     if request.method == 'POST':
         form = forms.DocumentTextSaveForm(request.POST, user=request.user, chunk=doc, prefix="textsave")
         if form.is_valid():
-            if request.user.is_authenticated():
-                author = request.user
-            else:
-                author = None
-            text = form.cleaned_data['text']
+            form.save()
             parent_revision = form.cleaned_data['parent_revision']
-            if parent_revision is not None:
-                parent = doc.at_revision(parent_revision)
-            else:
-                parent = None
-            stage = form.cleaned_data['stage_completed']
-            tags = [stage] if stage else []
-            publishable = form.cleaned_data['publishable'] and request.user.has_perm('catalogue.can_pubmark')
-            doc.commit(author=author,
-                       text=text,
-                       parent=parent,
-                       description=form.cleaned_data['comment'],
-                       tags=tags,
-                       author_name=form.cleaned_data['author_name'],
-                       author_email=form.cleaned_data['author_email'],
-                       publishable=publishable,
-                       )
-            doc.book.for_cybernauts = form.cleaned_data['for_cybernauts']
-            doc.book.save()
             revision = doc.revision()
             return JSONResponse({
                 'text': doc.materialize() if parent_revision != revision else None,