added model inheritance,

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

diff --git a/apps/wiki/forms.py b/apps/wiki/forms.py
index f6e6f40..b057be0 100644 (file)
--- a/apps/wiki/forms.py
+++ b/apps/wiki/forms.py
@@ -5,6 +5,7 @@
 #
 from django import forms
 from wiki.constants import DOCUMENT_TAGS, DOCUMENT_STAGES
 #
 from django import forms
 from wiki.constants import DOCUMENT_TAGS, DOCUMENT_STAGES

+from wiki.models import Book

 from django.utils.translation import ugettext_lazy as _
 
 
 from django.utils.translation import ugettext_lazy as _
 
 


@@ -18,16 +19,19 @@ class DocumentTagForm(forms.Form):
     revision = forms.IntegerField(widget=forms.HiddenInput)
 
 
     revision = forms.IntegerField(widget=forms.HiddenInput)
 
 

-class DocumentCreateForm(forms.Form):
+class DocumentCreateForm(forms.ModelForm):

     """
         Form used for creating new documents.
     """
     """
         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)
 
     file = forms.FileField(required=False)
     text = forms.CharField(required=False, widget=forms.Textarea)
 

+    class Meta:
+        model = Book
+        exclude = ['gallery']
+

     def clean(self):
     def clean(self):

+        super(DocumentCreateForm, self).clean()

         file = self.cleaned_data['file']
 
         if file is not None:
         file = self.cleaned_data['file']
 
         if file is not None:


@@ -42,37 +46,92 @@ class DocumentCreateForm(forms.Form):
         return self.cleaned_data
 
 
         return self.cleaned_data
 
 

+class DocumentsUploadForm(forms.Form):
+    """
+        Form used for uploading new documents.
+    """
+    file = forms.FileField(required=True, label=_('ZIP file'))
+
+    def clean(self):
+        file = self.cleaned_data['file']
+
+        import zipfile
+        try:
+            z = self.cleaned_data['zip'] = zipfile.ZipFile(file)
+        except zipfile.BadZipfile:
+            raise forms.ValidationError("Should be a ZIP file.")
+        if z.testzip():
+            raise forms.ValidationError("ZIP file corrupt.")
+
+        return self.cleaned_data
+
+

 class DocumentTextSaveForm(forms.Form):
     """
     Form for saving document's text:
 
 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.
 
     """
 
         * 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)
     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,
         required=False,

-        label=_(u"Autor"),
-        help_text=_(u"Twoje imie i nazwisko lub email."),
+        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=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."),
+    )
+
+
+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=True,
+        widget=forms.Textarea,
+        label=_(u"Your comments"),
+        help_text=_(u"Describe the reason for reverting."),

     )
     )