X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/24c1d259ba4af084959d70c6a1f355d0a57f1191..507752b933a466dd8e962c0e34d0ec74d6de55b7:/apps/wiki/forms.py?ds=inline

diff --git a/apps/wiki/forms.py b/apps/wiki/forms.py
index 2bd6e64e..d526bfc6 100644
--- a/apps/wiki/forms.py
+++ b/apps/wiki/forms.py
@@ -4,85 +4,140 @@
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 from django import forms
-from wiki.models import Document, getstorage
 from django.utils.translation import ugettext_lazy as _
 
+from catalogue.models import Chunk
+from catalogue.xml_tools import remove_empty_elements
 
-class DocumentForm(forms.Form):
-    """ Old form for saving document's text """
 
-    name = forms.CharField(widget=forms.HiddenInput)
-    text = forms.CharField(widget=forms.Textarea)
+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)
-    comment = forms.CharField()
 
-    def __init__(self, *args, **kwargs):
-        document = kwargs.pop('instance', None)
-        super(DocumentForm, self).__init__(*args, **kwargs)
-        if document:
-            self.fields['name'].initial = document.name
-            self.fields['text'].initial = document.text
-            self.fields['revision'].initial = document.revision()
 
-    def save(self, document_author='anonymous'):
-        storage = getstorage()
+class DocumentTextSaveForm(forms.Form):
+    """
+    Form for saving document's text:
+
+        * 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.
+
+    """
 
-        document = Document(storage, name=self.cleaned_data['name'], text=self.cleaned_data['text'])
+    parent_revision = forms.IntegerField(widget=forms.HiddenInput, required=False)
+    text = forms.CharField(widget=forms.HiddenInput)
 
-        storage.put(document,
-                author=document_author,
-                comment=self.cleaned_data['comment'],
-                parent=self.cleaned_data['revision'])
+    author_name = forms.CharField(
+        required=True,
+        label=_(u"Author"),
+        help_text=_(u"Your name"),
+    )
 
-        return storage.get(self.cleaned_data['name'])
+    author_email = forms.EmailField(
+        required=True,
+        label=_(u"Author's email"),
+        help_text=_(u"Your email address, so we can show a gravatar :)"),
+    )
 
+    comment = forms.CharField(
+        required=False,
+        widget=forms.Textarea,
+        label=_(u"Your comments"),
+        help_text=_(u"Describe changes you made."),
+    )
 
-class DocumentTagForm(forms.Form):
-    TAGS = (
-        ("publish", "Do publikacji"),
+    stage_completed = forms.ModelChoiceField(
+        queryset=Chunk.tag_model.objects.all(),
+        required=False,
+        label=_(u"Completed"),
+        help_text=_(u"If you completed a life cycle stage, select it."),
     )
 
-    tag = forms.ChoiceField(choices=TAGS)
-    version = forms.IntegerField(widget=forms.HiddenInput)
+    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.")
+    )
 
-class DocumentTextSaveForm(forms.Form):
+    def __init__(self, *args, **kwargs):
+        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
+        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):
     """
-    Form for saving document's text:
+    Form for reverting document's text:
 
-        * name - document's storage identifier.
-        * parent_revision - revision which the modified text originated from.
+        * revision - revision to revert to.
         * comment - user's verbose comment; will be used in commit.
-        * stage_completed - mark this change as end of given stage.
 
     """
-    DOC_STAGES = (
-        ('', 'Nic konkretnego'),
-        ('tagging', 'Tagowanie'),
-        ('modernized', 'Uwspółcześnienia'),
-        ('editing', 'Redakcja'),
-    )
 
-    id = forms.CharField(widget=forms.HiddenInput)
-    parent_revision = forms.IntegerField(widget=forms.HiddenInput)
-    text = forms.CharField(widget=forms.HiddenInput)
+    revision = forms.IntegerField(widget=forms.HiddenInput)
 
-    author = forms.CharField(
+    author_name = forms.CharField(
         required=False,
-        label=_(u"Autor"),
-        help_text=_(u"Twoje imie i nazwisko lub email."),
+        label=_(u"Author"),
+        help_text=_(u"Your name"),
     )
 
-    comment = forms.CharField(
-        required=True,
-        widget=forms.Textarea,
-        label=_(u"Twój komentarz"),
-        help_text=_(u"Opisz w miarę dokładnie swoje zmiany."),
+    author_email = forms.EmailField(
+        required=False,
+        label=_(u"Author's email"),
+        help_text=_(u"Your email address, so we can show a gravatar :)"),
     )
 
-    stage_completed = forms.ChoiceField(
-        choices=DOC_STAGES,
+    comment = forms.CharField(
         required=False,
-        label=_(u"Skończyłem robić"),
-        help_text=_(u"Jeśli skończyłeś jeden z etapów utworu, wybierz go."),
+        widget=forms.Textarea,
+        label=_(u"Your comments"),
+        help_text=_(u"Describe the reason for reverting."),
     )