Editor update - edumed exercises

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

diff --git a/apps/catalogue/forms.py b/apps/catalogue/forms.py
index f70dc47..85f92ef 100644 (file)
--- a/apps/catalogue/forms.py
+++ b/apps/catalogue/forms.py
@@ -9,37 +9,34 @@ from django import forms
 from django.utils.translation import ugettext_lazy as _
 
 from catalogue.constants import MASTERS
 from django.utils.translation import ugettext_lazy as _
 
 from catalogue.constants import MASTERS

-from catalogue.models import Book, Chunk
+from catalogue.models import Book, Chunk, Template

 
 class DocumentCreateForm(forms.ModelForm):
     """
         Form used for creating new documents.
     """
 
 class DocumentCreateForm(forms.ModelForm):
     """
         Form used for creating new documents.
     """

-    file = forms.FileField(required=False)
-    text = forms.CharField(required=False, widget=forms.Textarea)
+    template = forms.ModelChoiceField(Template.objects, required=False)

 
     class Meta:
         model = Book
 
     class Meta:
         model = Book

-        exclude = ['parent', 'parent_number']
+        exclude = ['parent', 'parent_number', 'project', 'gallery', 'public']

 
     def __init__(self, *args, **kwargs):
         super(DocumentCreateForm, self).__init__(*args, **kwargs)
         self.fields['slug'].widget.attrs={'class': 'autoslug'}
 
     def __init__(self, *args, **kwargs):
         super(DocumentCreateForm, self).__init__(*args, **kwargs)
         self.fields['slug'].widget.attrs={'class': 'autoslug'}

-        self.fields['gallery'].widget.attrs={'class': 'autoslug'}

         self.fields['title'].widget.attrs={'class': 'autoslug-source'}
         self.fields['title'].widget.attrs={'class': 'autoslug-source'}

+        self.fields['template'].queryset = Template.objects.filter(is_main=True)

 
     def clean(self):
         super(DocumentCreateForm, self).clean()
 
     def clean(self):
         super(DocumentCreateForm, self).clean()

-        file = self.cleaned_data['file']
+        template = self.cleaned_data['template']
+        self.cleaned_data['gallery'] = self.cleaned_data['slug']

 
 

-        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."))
+        if template is not None:
+            self.cleaned_data['text'] = template.content

 
 

-        if not self.cleaned_data["text"]:
-            self._errors["file"] = self.error_class([_("You must either enter text or upload a file")])
+        if not self.cleaned_data.get("text"):
+            self._errors["template"] = self.error_class([_("You must select a template")])

 
         return self.cleaned_data
 
 
         return self.cleaned_data
 


@@ -130,6 +127,7 @@ class BookForm(forms.ModelForm):
 
     class Meta:
         model = Book
 
     class Meta:
         model = Book

+        exclude = ['project']

 
     def __init__(self, *args, **kwargs):
         ret = super(BookForm, self).__init__(*args, **kwargs)
 
     def __init__(self, *args, **kwargs):
         ret = super(BookForm, self).__init__(*args, **kwargs)