X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/c52436a7e25876ee3509df2467c2a9ef33303436..f24d9ebf038312eb39c2e384c4ff55aa0dc9698a:/apps/wiki/forms.py?ds=sidebyside

diff --git a/apps/wiki/forms.py b/apps/wiki/forms.py
index 4fb71a5a..137b072f 100644
--- a/apps/wiki/forms.py
+++ b/apps/wiki/forms.py
@@ -4,44 +4,19 @@
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 from django import forms
-from wiki.models import Document, getstorage
-from wiki.constants import DOCUMENT_TAGS, DOCUMENT_STAGES
 from django.utils.translation import ugettext_lazy as _
 
+from catalogue.models import Chunk
 
-class DocumentForm(forms.Form):
-    """ Old form for saving document's text """
 
-    name = forms.CharField(widget=forms.HiddenInput)
-    text = forms.CharField(widget=forms.Textarea)
-    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()
-
-        document = Document(storage, name=self.cleaned_data['name'], text=self.cleaned_data['text'])
-
-        storage.put(document,
-                author=document_author,
-                comment=self.cleaned_data['comment'],
-                parent=self.cleaned_data['revision'])
-
-        return storage.get(self.cleaned_data['name'])
-
-
-class DocumentTagForm(forms.Form):
+class DocumentPubmarkForm(forms.Form):
+    """
+        Form for marking revisions for publishing.
+    """
 
     id = forms.CharField(widget=forms.HiddenInput)
-    tag = forms.ChoiceField(choices=DOCUMENT_TAGS)
+    publishable = forms.BooleanField(required=False, initial=True,
+            label=_('Publishable'))
     revision = forms.IntegerField(widget=forms.HiddenInput)
 
 
@@ -49,33 +24,81 @@ class DocumentTextSaveForm(forms.Form):
     """
     Form for saving document's text:
 
-        * name - document's storage identifier.
         * 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.
 
     """
 
-    id = forms.CharField(widget=forms.HiddenInput)
-    parent_revision = forms.IntegerField(widget=forms.HiddenInput)
+    parent_revision = forms.IntegerField(widget=forms.HiddenInput, required=False)
     text = forms.CharField(widget=forms.HiddenInput)
 
-    author = forms.CharField(
-        required=False,
-        label=_(u"Autor"),
-        help_text=_(u"Twoje imie i nazwisko lub email."),
+    author_name = forms.CharField(
+        required=True,
+        label=_(u"Author"),
+        help_text=_(u"Your name"),
     )
 
-    comment = forms.CharField(
+    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"Twój komentarz"),
-        help_text=_(u"Opisz w miarę dokładnie swoje zmiany."),
+        label=_(u"Your comments"),
+        help_text=_(u"Describe changes you made."),
     )
 
-    stage_completed = forms.ChoiceField(
-        choices=DOCUMENT_STAGES,
+    stage_completed = forms.ModelChoiceField(
+        queryset=Chunk.tag_model.objects.all(),
         required=False,
-        label=_(u"Skończyłem robić"),
-        help_text=_(u"Jeśli skończyłeś jeden z etapów utworu, wybierz go."),
+        label=_(u"Completed"),
+        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.")
+    )
+
+    def __init__(self, *args, **kwargs):
+        user = kwargs.pop('user')
+        r = super(DocumentTextSaveForm, self).__init__(*args, **kwargs)
+        if user and user.is_authenticated():
+            self.fields['author_name'].required = False
+            self.fields['author_email'].required = False
+        return r
+
+
+class DocumentTextRevertForm(forms.Form):
+    """
+    Form for reverting document's text:
+
+        * revision - revision to revert to.
+        * comment - user's verbose comment; will be used in commit.
+
+    """
+
+    revision = forms.IntegerField(widget=forms.HiddenInput)
+
+    author_name = forms.CharField(
+        required=False,
+        label=_(u"Author"),
+        help_text=_(u"Your name"),
+    )
+
+    author_email = forms.EmailField(
+        required=False,
+        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 the reason for reverting."),
     )