X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/24c1d259ba4af084959d70c6a1f355d0a57f1191..a980dc9ed36f367a04dfdc56e277375d9cca1bd1:/apps/wiki/forms.py?ds=sidebyside diff --git a/apps/wiki/forms.py b/apps/wiki/forms.py index 2bd6e64e..3ef3ed14 100644 --- a/apps/wiki/forms.py +++ b/apps/wiki/forms.py @@ -4,85 +4,101 @@ # 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 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() +class DocumentTextSaveForm(forms.Form): + """ + Form for saving document's text: - document = Document(storage, name=self.cleaned_data['name'], text=self.cleaned_data['text']) + * 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. - storage.put(document, - author=document_author, - comment=self.cleaned_data['comment'], - parent=self.cleaned_data['revision']) + """ - return storage.get(self.cleaned_data['name']) + 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 DocumentTagForm(forms.Form): - TAGS = ( - ("publish", "Do publikacji"), + author_email = forms.EmailField( + required=True, + label=_(u"Author's email"), + help_text=_(u"Your email address, so we can show a gravatar :)"), ) - tag = forms.ChoiceField(choices=TAGS) - version = forms.IntegerField(widget=forms.HiddenInput) + comment = forms.CharField( + required=True, + widget=forms.Textarea, + 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."), + ) -class DocumentTextSaveForm(forms.Form): + 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): """ - 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. """ - 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) + revision = forms.IntegerField(widget=forms.HiddenInput) + + author_name = forms.CharField( + required=False, + label=_(u"Author"), + help_text=_(u"Your name"), + ) - author = forms.CharField( + author_email = forms.EmailField( required=False, - label=_(u"Autor"), - help_text=_(u"Twoje imie i nazwisko lub email."), + 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."), - ) - - 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."), + label=_(u"Your comments"), + help_text=_(u"Describe the reason for reverting."), )