* Better "motto" display.

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

diff --git a/apps/wiki/forms.py b/apps/wiki/forms.py
index 2bd6e64..f6e6f40 100644 (file)
--- a/apps/wiki/forms.py
+++ b/apps/wiki/forms.py
@@ -4,46 +4,42 @@
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 from django import forms
 # 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 django.utils.translation import ugettext_lazy as _
 
 

-class DocumentForm(forms.Form):
-    """ Old form for saving document's text """
+class DocumentTagForm(forms.Form):
+    """
+        Form for tagging revisions.
+    """

 
 

-    name = forms.CharField(widget=forms.HiddenInput)
-    text = forms.CharField(widget=forms.Textarea)
+    id = forms.CharField(widget=forms.HiddenInput)
+    tag = forms.ChoiceField(choices=DOCUMENT_TAGS)

     revision = forms.IntegerField(widget=forms.HiddenInput)
     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'])
+class DocumentCreateForm(forms.Form):
+    """
+        Form used for creating new documents.
+    """
+    title = forms.CharField()
+    id = forms.RegexField(regex=ur"\w+")
+    file = forms.FileField(required=False)
+    text = forms.CharField(required=False, widget=forms.Textarea)

 
 

-        return storage.get(self.cleaned_data['name'])
+    def clean(self):
+        file = self.cleaned_data['file']

 
 

+        if file is not None:
+            try:
+                self.cleaned_data['text'] = file.read().decode('utf-8')
+            except UnicodeDecodeError:
+                raise forms.ValidationError("Text file must be UTF-8 encoded.")

 
 

-class DocumentTagForm(forms.Form):
-    TAGS = (
-        ("publish", "Do publikacji"),
-    )
+        if not self.cleaned_data["text"]:
+            raise forms.ValidationError("You must either enter text or upload a file")

 
 

-    tag = forms.ChoiceField(choices=TAGS)
-    version = forms.IntegerField(widget=forms.HiddenInput)
+        return self.cleaned_data

 
 
 class DocumentTextSaveForm(forms.Form):
 
 
 class DocumentTextSaveForm(forms.Form):


@@ -56,12 +52,6 @@ class DocumentTextSaveForm(forms.Form):
         * stage_completed - mark this change as end of given stage.
 
     """
         * 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)
 
     id = forms.CharField(widget=forms.HiddenInput)
     parent_revision = forms.IntegerField(widget=forms.HiddenInput)


@@ -81,7 +71,7 @@ class DocumentTextSaveForm(forms.Form):
     )
 
     stage_completed = forms.ChoiceField(
     )
 
     stage_completed = forms.ChoiceField(

-        choices=DOC_STAGES,
+        choices=DOCUMENT_STAGES,

         required=False,
         label=_(u"Skończyłem robić"),
         help_text=_(u"Jeśli skończyłeś jeden z etapów utworu, wybierz go."),
         required=False,
         label=_(u"Skończyłem robić"),
         help_text=_(u"Jeśli skończyłeś jeden z etapów utworu, wybierz go."),