X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/24c1d259ba4af084959d70c6a1f355d0a57f1191..bb419480f85e3ba6bfe147a6f05a1fc265b5592a:/apps/wiki/forms.py diff --git a/apps/wiki/forms.py b/apps/wiki/forms.py index 2bd6e64e..74934bd2 100644 --- a/apps/wiki/forms.py +++ b/apps/wiki/forms.py @@ -4,85 +4,130 @@ # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. # from django import forms -from wiki.models import Document, getstorage +from wiki.constants import DOCUMENT_TAGS, DOCUMENT_STAGES from django.utils.translation import ugettext_lazy as _ -class DocumentForm(forms.Form): - """ Old form for saving document's text """ +class DocumentTagForm(forms.Form): + """ + Form for tagging revisions. + """ - name = forms.CharField(widget=forms.HiddenInput) - text = forms.CharField(widget=forms.Textarea) + id = forms.CharField(widget=forms.HiddenInput) + tag = forms.ChoiceField(choices=DOCUMENT_TAGS) revision = forms.IntegerField(widget=forms.HiddenInput) - comment = forms.CharField() - def __init__(self, *args, **kwargs): - document = kwargs.pop('instance', None) - super(DocumentForm, self).__init__(*args, **kwargs) - if document: - self.fields['name'].initial = document.name - self.fields['text'].initial = document.text - self.fields['revision'].initial = document.revision() - def save(self, document_author='anonymous'): - storage = getstorage() +class DocumentCreateForm(forms.Form): + """ + Form used for creating new documents. + """ + title = forms.CharField() + id = forms.RegexField(regex=ur"^[-\wąćęłńóśźżĄĆĘŁŃÓŚŹŻ]+$") + file = forms.FileField(required=False) + text = forms.CharField(required=False, widget=forms.Textarea) - document = Document(storage, name=self.cleaned_data['name'], text=self.cleaned_data['text']) + def clean(self): + file = self.cleaned_data['file'] - storage.put(document, - author=document_author, - comment=self.cleaned_data['comment'], - parent=self.cleaned_data['revision']) + 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.") - return storage.get(self.cleaned_data['name']) + if not self.cleaned_data["text"]: + raise forms.ValidationError("You must either enter text or upload a file") + return self.cleaned_data -class DocumentTagForm(forms.Form): - TAGS = ( - ("publish", "Do publikacji"), - ) - tag = forms.ChoiceField(choices=TAGS) - version = forms.IntegerField(widget=forms.HiddenInput) +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: - * name - document's storage identifier. * 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. """ - DOC_STAGES = ( - ('', 'Nic konkretnego'), - ('tagging', 'Tagowanie'), - ('modernized', 'Uwspółcześnienia'), - ('editing', 'Redakcja'), - ) - id = forms.CharField(widget=forms.HiddenInput) parent_revision = forms.IntegerField(widget=forms.HiddenInput) text = forms.CharField(widget=forms.HiddenInput) - author = forms.CharField( + author_name = forms.CharField( required=False, - label=_(u"Autor"), - help_text=_(u"Twoje imie i nazwisko lub email."), + label=_(u"Author"), + help_text=_(u"Your name"), + ) + + author_email = forms.EmailField( + required=False, + label=_(u"Author's email"), + help_text=_(u"Your email address, so we can show a gravatar :)"), ) comment = forms.CharField( required=True, widget=forms.Textarea, - label=_(u"Twój komentarz"), - help_text=_(u"Opisz w miarę dokładnie swoje zmiany."), + label=_(u"Your comments"), + help_text=_(u"Describe changes you made."), ) stage_completed = forms.ChoiceField( - choices=DOC_STAGES, + choices=DOCUMENT_STAGES, + required=False, + label=_(u"Completed"), + help_text=_(u"If you completed a life cycle stage, select it."), + ) + + +class DocumentTextRevertForm(forms.Form): + """ + Form for reverting document's text: + + * revision - revision to revert to. + * comment - user's verbose comment; will be used in commit. + + """ + + revision = forms.IntegerField(widget=forms.HiddenInput) + + author_name = forms.CharField( required=False, - label=_(u"Skończyłem robić"), - help_text=_(u"Jeśli skończyłeś jeden z etapów utworu, wybierz go."), + label=_(u"Author"), + help_text=_(u"Your name"), + ) + + author_email = forms.EmailField( + required=False, + label=_(u"Author's email"), + help_text=_(u"Your email address, so we can show a gravatar :)"), + ) + + comment = forms.CharField( + required=True, + widget=forms.Textarea, + label=_(u"Your comments"), + help_text=_(u"Describe the reason for reverting."), )