Merge branch 'edumed' of https://github.com/fnp/redakcja into edumed

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

diff --git a/apps/catalogue/forms.py b/apps/catalogue/forms.py
index 8cd00c2..f70dc47 100644 (file)
--- a/apps/catalogue/forms.py
+++ b/apps/catalogue/forms.py
@@ -3,7 +3,7 @@
 # This file is part of FNP-Redakcja, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
-from django.contrib.auth.models import User
+from catalogue.models import User
 from django.db.models import Count
 from django import forms
 from django.utils.translation import ugettext_lazy as _
@@ -20,8 +20,13 @@ class DocumentCreateForm(forms.ModelForm):
 
     class Meta:
         model = Book
-        exclude = ['gallery', 'parent', 'parent_number']
-        prepopulated_fields = {'slug': ['title']}
+        exclude = ['parent', 'parent_number']
+
+    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'}
 
     def clean(self):
         super(DocumentCreateForm, self).clean()
@@ -31,10 +36,10 @@ class DocumentCreateForm(forms.ModelForm):
             try:
                 self.cleaned_data['text'] = file.read().decode('utf-8')
             except UnicodeDecodeError:
-                raise forms.ValidationError("Text file must be UTF-8 encoded.")
+                raise forms.ValidationError(_("Text file must be UTF-8 encoded."))
 
         if not self.cleaned_data["text"]:
-            raise forms.ValidationError("You must either enter text or upload a file")
+            self._errors["file"] = self.error_class([_("You must either enter text or upload a file")])
 
         return self.cleaned_data
 
@@ -67,16 +72,17 @@ class ChunkForm(forms.ModelForm):
     """
     user = forms.ModelChoiceField(queryset=
         User.objects.annotate(count=Count('chunk')).
-        order_by('-count', 'last_name', 'first_name'), required=False,
+        order_by('last_name', 'first_name'), required=False,
         label=_('Assigned to')) 
 
     class Meta:
         model = Chunk
-        fields = ['title', 'slug', 'user', 'stage']
+        fields = ['title', 'slug', 'gallery_start', 'user', 'stage']
         exclude = ['number']
 
     def __init__(self, *args, **kwargs):
         super(ChunkForm, self).__init__(*args, **kwargs)
+        self.fields['gallery_start'].widget.attrs={'class': 'number-input'}
         self.fields['slug'].widget.attrs={'class': 'autoslug'}
         self.fields['title'].widget.attrs={'class': 'autoslug-source'}