X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/1dfd391b507447d7f4a66863e4f6003979777426..a980dc9ed36f367a04dfdc56e277375d9cca1bd1:/apps/wiki/forms.py?ds=sidebyside diff --git a/apps/wiki/forms.py b/apps/wiki/forms.py index 0a5be8ca..3ef3ed14 100644 --- a/apps/wiki/forms.py +++ b/apps/wiki/forms.py @@ -4,78 +4,85 @@ # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. # from django import forms -from wiki.constants import DOCUMENT_TAGS, DOCUMENT_STAGES 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.Form): - """ - Form used for creating new documents. +class DocumentTextSaveForm(forms.Form): """ - title = forms.CharField() - id = forms.RegexField(regex=ur"\w+") - file = forms.FileField(required=False) - text = forms.CharField(required=False, widget=forms.Textarea) + Form for saving document's text: - def clean(self): - file = self.cleaned_data['file'] + * parent_revision - revision which the modified text originated from. + * comment - user's verbose comment; will be used in commit. + * stage_completed - mark this change as end of given stage. - 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") + parent_revision = forms.IntegerField(widget=forms.HiddenInput, required=False) + text = forms.CharField(widget=forms.HiddenInput) - return self.cleaned_data + author_name = forms.CharField( + required=True, + label=_(u"Author"), + help_text=_(u"Your name"), + ) + author_email = forms.EmailField( + required=True, + label=_(u"Author's email"), + help_text=_(u"Your email address, so we can show a gravatar :)"), + ) -class DocumentsUploadForm(forms.Form): - """ - Form used for uploading new documents. - """ - file = forms.FileField(required=True, label=_('ZIP file')) + comment = forms.CharField( + required=True, + widget=forms.Textarea, + label=_(u"Your comments"), + help_text=_(u"Describe changes you made."), + ) - def clean(self): - file = self.cleaned_data['file'] + 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."), + ) - 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.") + publishable = forms.BooleanField(required=False, initial=False, + label=_('Publishable'), + help_text=_(u"Mark this revision as publishable.") + ) - return self.cleaned_data + 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 DocumentTextSaveForm(forms.Form): +class DocumentTextRevertForm(forms.Form): """ - Form for saving document's text: + Form for reverting document's text: - * name - document's storage identifier. - * parent_revision - revision which the modified text originated from. + * revision - revision to revert to. * comment - user's verbose comment; will be used in commit. - * stage_completed - mark this change as end of given stage. """ - id = forms.CharField(widget=forms.HiddenInput) - parent_revision = forms.IntegerField(widget=forms.HiddenInput) - text = forms.CharField(widget=forms.HiddenInput) + revision = forms.IntegerField(widget=forms.HiddenInput) author_name = forms.CharField( required=False, @@ -93,12 +100,5 @@ class DocumentTextSaveForm(forms.Form): required=True, widget=forms.Textarea, label=_(u"Your comments"), - help_text=_(u"Describe changes you made."), - ) - - stage_completed = forms.ChoiceField( - choices=DOCUMENT_STAGES, - required=False, - label=_(u"Completed"), - help_text=_(u"If you completed a life cycle stage, select it."), + help_text=_(u"Describe the reason for reverting."), )