X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/83fe2a8e363f2b9f3ece27227b8194bafadfe47f..aa48ae37a4a0c49642ca4f21c809099c05c79865:/apps/wiki/forms.py diff --git a/apps/wiki/forms.py b/apps/wiki/forms.py index 137b072f..bee0e192 100644 --- a/apps/wiki/forms.py +++ b/apps/wiki/forms.py @@ -6,18 +6,8 @@ from django import forms from django.utils.translation import ugettext_lazy as _ -from catalogue.models import Chunk - - -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) +from catalogue.models import Document +from catalogue.constants import STAGES class DocumentTextSaveForm(forms.Form): @@ -26,7 +16,7 @@ class DocumentTextSaveForm(forms.Form): * 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. + * stage - change to this stage """ @@ -52,16 +42,11 @@ class DocumentTextSaveForm(forms.Form): help_text=_(u"Describe changes you made."), ) - stage_completed = forms.ModelChoiceField( - queryset=Chunk.tag_model.objects.all(), + stage = forms.ChoiceField( + choices = [(s, s) for s in STAGES], 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.") + label=_(u"Stage"), + help_text=_(u"If completed a work stage, change to another one."), ) def __init__(self, *args, **kwargs): @@ -102,3 +87,7 @@ class DocumentTextRevertForm(forms.Form): label=_(u"Your comments"), help_text=_(u"Describe the reason for reverting."), ) + + +class DocumentTextPublishForm(forms.Form): + revision = forms.IntegerField(widget=forms.HiddenInput)