X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/f155d09d81873bcb831186335a94c5a76843a33d..80fd830bac39b384ba9542541bb9bc605748ee0c:/apps/catalogue/forms.py?ds=inline diff --git a/apps/catalogue/forms.py b/apps/catalogue/forms.py index 7ae7ff40..285e58e5 100644 --- a/apps/catalogue/forms.py +++ b/apps/catalogue/forms.py @@ -9,13 +9,14 @@ 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) + template = forms.ModelChoiceField(Template.objects, required=False) text = forms.CharField(required=False, widget=forms.Textarea) class Meta: @@ -27,19 +28,23 @@ class DocumentCreateForm(forms.ModelForm): 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'] + 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.")) + elif 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")]) + self._errors["file"] = self.error_class([_("You must enter text, upload a file or select a template")]) return self.cleaned_data