X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/02a98d2af6f1fabf567b575c5f2d818688af1594..96ba22467ff530002a5069168a47711d3293ef53:/apps/wiki/forms.py?ds=sidebyside diff --git a/apps/wiki/forms.py b/apps/wiki/forms.py index ca219889..3ef3ed14 100644 --- a/apps/wiki/forms.py +++ b/apps/wiki/forms.py @@ -1,79 +1,104 @@ # -*- coding: utf-8 -*- # # This file is part of FNP-Redakcja, licensed under GNU Affero GPLv3 or later. -# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. +# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. # from django import forms -from wiki.models import Document, getstorage -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import ugettext_lazy as _ +from catalogue.models import Chunk -class DocumentForm(forms.Form): - """ Old form for saving document's text """ - - name = forms.CharField(widget=forms.HiddenInput) - text = forms.CharField(widget=forms.Textarea) + +class DocumentPubmarkForm(forms.Form): + """ + Form for marking revisions for publishing. + """ + + id = forms.CharField(widget=forms.HiddenInput) + publishable = forms.BooleanField(required=False, initial=True, + label=_('Publishable')) 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() - - document = Document(storage, name=self.cleaned_data['name'], text=self.cleaned_data['text']) - - storage.put(document, - author = document_author, - comment = self.cleaned_data['comment'], - parent =self.cleaned_data['revision'] ) - - return storage.get(self.cleaned_data['name']) + 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) - - author = forms.CharField( - required = False, - label = _(u"Autor"), - help_text = _(u"Twoje imie i nazwisko lub email.") - + + 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"), + ) + + author_email = forms.EmailField( + required=True, + label=_(u"Author's email"), + help_text=_(u"Your email address, so we can show a gravatar :)"), ) - + comment = forms.CharField( - required = False, + 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.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.") ) - - stage_completed = forms.ChoiceField( - choices=DOC_STAGES, - required= False, - label = _(u"Skończyłem robić"), - help_text = _(u"Jeśli skończyłeś jeden z etapów utworu, wybierz go."), + + 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): + """ + 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"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."), ) - \ No newline at end of file