fixing editor bootstrap configuration

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

diff --git a/apps/catalogue/forms.py b/apps/catalogue/forms.py
index ad1e4d6..285e58e 100644 (file)
--- a/apps/catalogue/forms.py
+++ b/apps/catalogue/forms.py
@@ -3,43 +3,48 @@
 # This file is part of FNP-Redakcja, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 # 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 _
 
 from catalogue.constants import MASTERS
 from django.db.models import Count
 from django import forms
 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.
     """
     file = forms.FileField(required=False)
 
 class DocumentCreateForm(forms.ModelForm):
     """
         Form used for creating new documents.
     """
     file = forms.FileField(required=False)

+    template = forms.ModelChoiceField(Template.objects, required=False)

     text = forms.CharField(required=False, widget=forms.Textarea)
 
     class Meta:
         model = Book
     text = forms.CharField(required=False, widget=forms.Textarea)
 
     class Meta:
         model = Book

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

 
     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 __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['template'].queryset = Template.objects.filter(is_main=True)

 
     def clean(self):
         super(DocumentCreateForm, self).clean()
         file = self.cleaned_data['file']
 
     def clean(self):
         super(DocumentCreateForm, self).clean()
         file = self.cleaned_data['file']

+        template = self.cleaned_data['template']

 
         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 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."))

+        elif template is not None:
+            self.cleaned_data['text'] = template.content

 
         if not self.cleaned_data["text"]:
 
         if not self.cleaned_data["text"]:

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

 
         return self.cleaned_data
 
 
         return self.cleaned_data
 


@@ -72,16 +77,17 @@ class ChunkForm(forms.ModelForm):
     """
     user = forms.ModelChoiceField(queryset=
         User.objects.annotate(count=Count('chunk')).
     """
     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
         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)
         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'}
 
         self.fields['slug'].widget.attrs={'class': 'autoslug'}
         self.fields['title'].widget.attrs={'class': 'autoslug-source'}
 


@@ -129,6 +135,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)