X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/cbb14d2ed3eb0b72a6c3c68ab93847923e6142f4..c58ede829174b66ec4d2b0c949b771a3eed27e1b:/apps/wiki/forms.py?ds=inline diff --git a/apps/wiki/forms.py b/apps/wiki/forms.py index b057be05..3ef3ed14 100644 --- a/apps/wiki/forms.py +++ b/apps/wiki/forms.py @@ -4,68 +4,22 @@ # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. # from django import forms -from wiki.constants import DOCUMENT_TAGS, DOCUMENT_STAGES -from wiki.models import Book from django.utils.translation import ugettext_lazy as _ +from catalogue.models import Chunk -class DocumentTagForm(forms.Form): + +class DocumentPubmarkForm(forms.Form): """ - Form for tagging revisions. + Form for marking revisions for publishing. """ id = forms.CharField(widget=forms.HiddenInput) - tag = forms.ChoiceField(choices=DOCUMENT_TAGS) + publishable = forms.BooleanField(required=False, initial=True, + label=_('Publishable')) 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'] - - 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: @@ -76,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 :)"), ) @@ -98,13 +52,26 @@ class DocumentTextSaveForm(forms.Form): help_text=_(u"Describe changes you made."), ) - stage_completed = forms.ChoiceField( - choices=DOCUMENT_STAGES, + stage_completed = forms.ModelChoiceField( + queryset=Chunk.tag_model.objects.all(), required=False, label=_(u"Completed"), 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): """