X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/4e7aaa55651ce32fed3e729ff6b8da680a30fd36..65272584c324400613b037432b3802f9956ef5d6:/apps/wiki/views.py diff --git a/apps/wiki/views.py b/apps/wiki/views.py index 6a5f2ac5..0fc52f3c 100644 --- a/apps/wiki/views.py +++ b/apps/wiki/views.py @@ -20,7 +20,7 @@ from django.utils.translation import ugettext as _ from django.views.decorators.http import require_POST from django.shortcuts import get_object_or_404, render -from catalogue.models import Document, Template +from catalogue.models import Document, Template, Category from dvcs.models import Revision import nice_diff from wiki import forms @@ -82,6 +82,7 @@ def editor(request, pk, template_name='wiki/bootstrap.html'): "text_revert": forms.DocumentTextRevertForm(prefix="textrevert"), "text_publish": forms.DocumentTextPublishForm(prefix="textpublish"), }, + 'tag_categories': Category.objects.all(), 'pk': doc.pk, }) @@ -107,9 +108,6 @@ def text(request, doc_id): # else: # parent = None stage = form.cleaned_data['stage'] - # tags = [stage] if stage else [] - # publishable = (form.cleaned_data['publishable'] and - # request.user.has_perm('catalogue.can_pubmark')) try: doc.commit( author=author, @@ -138,7 +136,7 @@ def text(request, doc_id): try: revision = int(revision) except (ValueError, TypeError): - revision = doc.revision() + revision = doc.revision if revision is not None: text = doc.at_revision(revision).materialize()