X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/8830e06ad0b466c40747540b5122e6825114a90a..d5ffd31f4dca5ab0144fae542e048934bafa7110:/apps/wiki/forms.py?ds=inline diff --git a/apps/wiki/forms.py b/apps/wiki/forms.py index 3626b6d3..d526bfc6 100644 --- a/apps/wiki/forms.py +++ b/apps/wiki/forms.py @@ -4,20 +4,10 @@ # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. # from django import forms -from wiki.models import Book, Chunk from django.utils.translation import ugettext_lazy as _ -from dvcs.models import Tag -from wiki.constants import MASTERS - -class DocumentTagForm(forms.Form): - """ - Form for tagging revisions. - """ - - id = forms.CharField(widget=forms.HiddenInput) - tag = forms.ModelChoiceField(queryset=Tag.objects.all()) - revision = forms.IntegerField(widget=forms.HiddenInput) +from catalogue.models import Chunk +from catalogue.xml_tools import remove_empty_elements class DocumentPubmarkForm(forms.Form): @@ -26,59 +16,10 @@ class DocumentPubmarkForm(forms.Form): """ id = forms.CharField(widget=forms.HiddenInput) - publishable = forms.BooleanField(required=False, initial=True, - label=_('Publishable')) + publishable = forms.BooleanField(required=False, initial=True, label=_('Publishable')) revision = forms.IntegerField(widget=forms.HiddenInput) -class DocumentCreateForm(forms.ModelForm): - """ - Form used for creating new documents. - """ - file = forms.FileField(required=False) - text = forms.CharField(required=False, widget=forms.Textarea) - - class Meta: - model = Book - exclude = ['gallery', 'parent', 'parent_number'] - prepopulated_fields = {'slug': ['title']} - - def clean(self): - super(DocumentCreateForm, self).clean() - file = self.cleaned_data['file'] - - 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.") - - if not self.cleaned_data["text"]: - raise forms.ValidationError("You must either enter text or upload a file") - - return self.cleaned_data - - -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: @@ -89,35 +30,87 @@ class DocumentTextSaveForm(forms.Form): """ - parent_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=False, + required=True, label=_(u"Author"), help_text=_(u"Your name"), ) author_email = forms.EmailField( - required=False, + required=True, label=_(u"Author's email"), help_text=_(u"Your email address, so we can show a gravatar :)"), ) comment = forms.CharField( - required=True, + required=False, widget=forms.Textarea, label=_(u"Your comments"), help_text=_(u"Describe changes you made."), ) stage_completed = forms.ModelChoiceField( - queryset=Tag.objects.all(), + 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.")) + + for_cybernauts = forms.BooleanField( + required=False, initial=False, + label=_(u"For Cybernauts"), + help_text=_(u"Mark this document for Cybernauts.") + ) + + def __init__(self, *args, **kwargs): + self.user = kwargs.pop('user') + self.chunk = kwargs.pop('chunk') + super(DocumentTextSaveForm, self).__init__(*args, **kwargs) + if self.user and self.user.is_authenticated(): + self.fields['author_name'].required = False + self.fields['author_email'].required = False + self.fields['for_cybernauts'].initial = self.chunk.book.for_cybernauts + self.fields['publishable'].initial = self.chunk.head.publishable + + def clean_text(self): + text = self.cleaned_data.get('text', '') + # remove_empty_elements returns None on SyntaxError or when there's no change + return remove_empty_elements(text) or text + + def save(self): + if self.user.is_authenticated(): + author = self.user + else: + author = None + text = self.cleaned_data['text'] + parent_revision = self.cleaned_data['parent_revision'] + if parent_revision is not None: + parent = self.chunk.at_revision(parent_revision) + else: + parent = None + stage = self.cleaned_data['stage_completed'] + tags = [stage] if stage else [] + publishable = self.cleaned_data['publishable'] and self.user.has_perm('catalogue.can_pubmark') + self.chunk.commit( + author=author, + text=text, + parent=parent, + description=self.cleaned_data['comment'], + tags=tags, + author_name=self.cleaned_data['author_name'], + author_email=self.cleaned_data['author_email'], + publishable=publishable) + self.chunk.book.for_cybernauts = self.cleaned_data['for_cybernauts'] + self.chunk.book.save() + class DocumentTextRevertForm(forms.Form): """ @@ -143,71 +136,8 @@ class DocumentTextRevertForm(forms.Form): ) comment = forms.CharField( - required=True, + required=False, widget=forms.Textarea, label=_(u"Your comments"), help_text=_(u"Describe the reason for reverting."), ) - - -class ChunkForm(forms.ModelForm): - """ - Form used for editing a chunk. - """ - - class Meta: - model = Chunk - exclude = ['number'] - - def clean_slug(self): - slug = self.cleaned_data['slug'] - try: - chunk = Chunk.objects.get(book=self.instance.book, slug=slug) - except Chunk.DoesNotExist: - return slug - if chunk == self.instance: - return slug - raise forms.ValidationError(_('Chunk with this slug already exists')) - - -class ChunkAddForm(ChunkForm): - """ - Form used for adding a chunk to a document. - """ - - def clean_slug(self): - slug = self.cleaned_data['slug'] - try: - user = Chunk.objects.get(book=self.instance.book, slug=slug) - except Chunk.DoesNotExist: - return slug - raise forms.ValidationError(_('Chunk with this slug already exists')) - - - - -class BookAppendForm(forms.Form): - """ - Form for appending a book to another book. - It means moving all chunks from book A to book B and deleting A. - """ - - append_to = forms.ModelChoiceField(queryset=Book.objects.all(), - label=_("Append to")) - - -class BookForm(forms.ModelForm): - """ - Form used for editing a Book. - """ - - class Meta: - model = Book - - -class ChooseMasterForm(forms.Form): - """ - Form used for fixing the chunks in a book. - """ - - master = forms.ChoiceField(choices=((m, m) for m in MASTERS))