fix author name/email in commit

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

diff --git a/apps/wiki/forms.py b/apps/wiki/forms.py
index 4fb71a5..e0c69fd 100644 (file)
--- a/apps/wiki/forms.py
+++ b/apps/wiki/forms.py
@@ -4,45 +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 wiki.constants import DOCUMENT_TAGS, DOCUMENT_STAGES
 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):
+        if not self.cleaned_data["text"]:
+            raise forms.ValidationError("You must either enter text or upload a file")

 
 

-    id = forms.CharField(widget=forms.HiddenInput)
-    tag = forms.ChoiceField(choices=DOCUMENT_TAGS)
-    revision = forms.IntegerField(widget=forms.HiddenInput)
+        return self.cleaned_data

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


@@ -60,22 +57,28 @@ class DocumentTextSaveForm(forms.Form):
     parent_revision = forms.IntegerField(widget=forms.HiddenInput)
     text = forms.CharField(widget=forms.HiddenInput)
 
     parent_revision = forms.IntegerField(widget=forms.HiddenInput)
     text = forms.CharField(widget=forms.HiddenInput)
 

-    author = forms.CharField(
+    author_name = forms.CharField(
+        required=False,
+        label=_(u"Author"),
+        help_text=_(u"Your name/"),
+    )
+
+    author_email = forms.EmailField(

         required=False,
         required=False,

-        label=_(u"Autor"),
-        help_text=_(u"Twoje imie i nazwisko lub email."),
+        label=_(u"Author's email"),
+        help_text=_(u"Your email address, so we can show a gravatar :)"),

     )
 
     comment = forms.CharField(
         required=True,
         widget=forms.Textarea,
     )
 
     comment = forms.CharField(
         required=True,
         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,
         required=False,
     )
 
     stage_completed = forms.ChoiceField(
         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."),
+        label=_(u"Completed"),
+        help_text=_(u"If you completed a life cycle stage, select it."),

     )
     )