update librarian

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

diff --git a/apps/wiki/forms.py b/apps/wiki/forms.py
index bee0e19..3ea36a3 100644 (file)
--- a/apps/wiki/forms.py
+++ b/apps/wiki/forms.py
@@ -4,10 +4,11 @@
 # 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 django.core.exceptions import ValidationError

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

-from catalogue.models import Document

 from catalogue.constants import STAGES
 from catalogue.constants import STAGES

+from librarian.document import Document

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


@@ -43,7 +44,7 @@ class DocumentTextSaveForm(forms.Form):
     )
 
     stage = forms.ChoiceField(
     )
 
     stage = forms.ChoiceField(

-        choices = [(s, s) for s in STAGES],
+        choices=[(s, s) for s in STAGES],

         required=False,
         label=_(u"Stage"),
         help_text=_(u"If completed a work stage, change to another one."),
         required=False,
         label=_(u"Stage"),
         help_text=_(u"If completed a work stage, change to another one."),


@@ -51,11 +52,18 @@ class DocumentTextSaveForm(forms.Form):
 
     def __init__(self, *args, **kwargs):
         user = kwargs.pop('user')
 
     def __init__(self, *args, **kwargs):
         user = kwargs.pop('user')

-        r = super(DocumentTextSaveForm, self).__init__(*args, **kwargs)
+        super(DocumentTextSaveForm, self).__init__(*args, **kwargs)

         if user and user.is_authenticated():
             self.fields['author_name'].required = False
             self.fields['author_email'].required = False
         if user and user.is_authenticated():
             self.fields['author_name'].required = False
             self.fields['author_email'].required = False

-        return r
+
+    def clean_text(self):
+        text = self.cleaned_data['text']
+        try:
+            Document.from_string(text)
+        except ValueError as e:
+            raise ValidationError(e.message)
+        return text

 
 
 class DocumentTextRevertForm(forms.Form):
 
 
 class DocumentTextRevertForm(forms.Form):