X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/bb551d54ea65621cae28c6acbfd91b22dc441dae..361f5a8e3f2520e2f63c9b2b432ccc51689e076a:/apps/wiki/forms.py?ds=sidebyside diff --git a/apps/wiki/forms.py b/apps/wiki/forms.py index 6b10909b..3ef3ed14 100644 --- a/apps/wiki/forms.py +++ b/apps/wiki/forms.py @@ -3,22 +3,10 @@ # 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 django.db.models import Count from django import forms from django.utils.translation import ugettext_lazy as _ -from wiki.constants import MASTERS -from wiki.models import Book, Chunk - -class DocumentTagForm(forms.Form): - """ - Form for tagging revisions. - """ - - id = forms.CharField(widget=forms.HiddenInput) - tag = forms.ModelChoiceField(queryset=Chunk.tag_model.objects.all()) - revision = forms.IntegerField(widget=forms.HiddenInput) +from catalogue.models import Chunk class DocumentPubmarkForm(forms.Form): @@ -32,54 +20,6 @@ class DocumentPubmarkForm(forms.Form): revision = forms.IntegerField(widget=forms.HiddenInput) -class DocumentCreateForm(forms.ModelForm): - """ - Form used for creating new documents. - """ - file = forms.FileField(required=False) - text = forms.CharField(required=False, widget=forms.Textarea) - - class Meta: - model = Book - exclude = ['gallery', 'parent', 'parent_number'] - prepopulated_fields = {'slug': ['title']} - - def clean(self): - super(DocumentCreateForm, self).clean() - file = self.cleaned_data['file'] - - 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 not self.cleaned_data["text"]: - raise forms.ValidationError("You must either enter text or upload a file") - - return self.cleaned_data - - -class DocumentsUploadForm(forms.Form): - """ - Form used for uploading new documents. - """ - file = forms.FileField(required=True, label=_('ZIP file')) - - def clean(self): - file = self.cleaned_data['file'] - - import zipfile - try: - z = self.cleaned_data['zip'] = zipfile.ZipFile(file) - except zipfile.BadZipfile: - raise forms.ValidationError("Should be a ZIP file.") - if z.testzip(): - raise forms.ValidationError("ZIP file corrupt.") - - return self.cleaned_data - - class DocumentTextSaveForm(forms.Form): """ Form for saving document's text: @@ -90,17 +30,17 @@ class DocumentTextSaveForm(forms.Form): """ - parent_revision = forms.IntegerField(widget=forms.HiddenInput) + parent_revision = forms.IntegerField(widget=forms.HiddenInput, required=False) text = forms.CharField(widget=forms.HiddenInput) author_name = forms.CharField( - required=False, + required=True, label=_(u"Author"), help_text=_(u"Your name"), ) author_email = forms.EmailField( - required=False, + required=True, label=_(u"Author's email"), help_text=_(u"Your email address, so we can show a gravatar :)"), ) @@ -119,6 +59,19 @@ class DocumentTextSaveForm(forms.Form): help_text=_(u"If you completed a life cycle stage, select it."), ) + publishable = forms.BooleanField(required=False, initial=False, + label=_('Publishable'), + help_text=_(u"Mark this revision as publishable.") + ) + + def __init__(self, *args, **kwargs): + user = kwargs.pop('user') + r = super(DocumentTextSaveForm, self).__init__(*args, **kwargs) + if user and user.is_authenticated(): + self.fields['author_name'].required = False + self.fields['author_email'].required = False + return r + class DocumentTextRevertForm(forms.Form): """ @@ -149,70 +102,3 @@ class DocumentTextRevertForm(forms.Form): label=_(u"Your comments"), help_text=_(u"Describe the reason for reverting."), ) - - -class ChunkForm(forms.ModelForm): - """ - Form used for editing a chunk. - """ - user = forms.ModelChoiceField(queryset= - User.objects.annotate(count=Count('chunk')). - order_by('-count', 'last_name', 'first_name')) - - - class Meta: - model = Chunk - exclude = ['number'] - - def clean_slug(self): - slug = self.cleaned_data['slug'] - try: - chunk = Chunk.objects.get(book=self.instance.book, slug=slug) - except Chunk.DoesNotExist: - return slug - if chunk == self.instance: - return slug - raise forms.ValidationError(_('Chunk with this slug already exists')) - - -class ChunkAddForm(ChunkForm): - """ - Form used for adding a chunk to a document. - """ - - def clean_slug(self): - slug = self.cleaned_data['slug'] - try: - user = Chunk.objects.get(book=self.instance.book, slug=slug) - except Chunk.DoesNotExist: - return slug - raise forms.ValidationError(_('Chunk with this slug already exists')) - - - - -class BookAppendForm(forms.Form): - """ - Form for appending a book to another book. - It means moving all chunks from book A to book B and deleting A. - """ - - append_to = forms.ModelChoiceField(queryset=Book.objects.all(), - label=_("Append to")) - - -class BookForm(forms.ModelForm): - """ - Form used for editing a Book. - """ - - class Meta: - model = Book - - -class ChooseMasterForm(forms.Form): - """ - Form used for fixing the chunks in a book. - """ - - master = forms.ChoiceField(choices=((m, m) for m in MASTERS))