X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/8f0e18f498d6c07937c92d186bfa6b654a1afa14..c2a6a31c6e1f6dafa17ab8e5bbd5714800ae36a3:/apps/wiki/forms.py diff --git a/apps/wiki/forms.py b/apps/wiki/forms.py index e0c69fdd..3ea36a32 100644 --- a/apps/wiki/forms.py +++ b/apps/wiki/forms.py @@ -4,63 +4,83 @@ # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. # from django import forms -from wiki.constants import DOCUMENT_TAGS, DOCUMENT_STAGES +from django.core.exceptions import ValidationError from django.utils.translation import ugettext_lazy as _ +from catalogue.constants import STAGES +from librarian.document import Document -class DocumentTagForm(forms.Form): + +class DocumentTextSaveForm(forms.Form): """ - Form for tagging revisions. + Form for saving document's text: + + * parent_revision - revision which the modified text originated from. + * comment - user's verbose comment; will be used in commit. + * stage - change to this stage + """ - id = forms.CharField(widget=forms.HiddenInput) - tag = forms.ChoiceField(choices=DOCUMENT_TAGS) - 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=True, + label=_(u"Author"), + help_text=_(u"Your name"), + ) -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) + author_email = forms.EmailField( + required=True, + label=_(u"Author's email"), + help_text=_(u"Your email address, so we can show a gravatar :)"), + ) - def clean(self): - file = self.cleaned_data['file'] + comment = forms.CharField( + required=False, + widget=forms.Textarea, + label=_(u"Your comments"), + help_text=_(u"Describe changes you made."), + ) - 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.") + stage = forms.ChoiceField( + choices=[(s, s) for s in STAGES], + required=False, + label=_(u"Stage"), + help_text=_(u"If completed a work stage, change to another one."), + ) - if not self.cleaned_data["text"]: - raise forms.ValidationError("You must either enter text or upload a file") + def __init__(self, *args, **kwargs): + user = kwargs.pop('user') + 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 self.cleaned_data + def clean_text(self): + text = self.cleaned_data['text'] + try: + Document.from_string(text) + except ValueError as e: + raise ValidationError(e.message) + return text -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, label=_(u"Author"), - help_text=_(u"Your name/"), + help_text=_(u"Your name"), ) author_email = forms.EmailField( @@ -70,15 +90,12 @@ class DocumentTextSaveForm(forms.Form): ) comment = forms.CharField( - required=True, + required=False, widget=forms.Textarea, label=_(u"Your comments"), - help_text=_(u"Describe changes you made."), + help_text=_(u"Describe the reason for reverting."), ) - stage_completed = forms.ChoiceField( - choices=DOCUMENT_STAGES, - required=False, - label=_(u"Completed"), - help_text=_(u"If you completed a life cycle stage, select it."), - ) + +class DocumentTextPublishForm(forms.Form): + revision = forms.IntegerField(widget=forms.HiddenInput)