X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/24817832933e76ec501753bb23d680995b3af7a1..40cb5e964bdacbd6873ea2d970c1e8974922e344:/apps/wiki/views.py diff --git a/apps/wiki/views.py b/apps/wiki/views.py index bd9e2c57..d7763025 100644 --- a/apps/wiki/views.py +++ b/apps/wiki/views.py @@ -15,6 +15,7 @@ from django.utils.translation import ugettext as _ from django.views.decorators.http import require_POST, require_GET from django.shortcuts import get_object_or_404, render from django.utils import simplejson +from django.contrib.auth.decorators import login_required from catalogue.models import Book, Chunk, Template import nice_diff @@ -51,6 +52,7 @@ def get_history(chunk): @never_cache +@login_required def editor(request, slug, chunk=None, template_name='wiki/bootstrap.html'): try: chunk = Chunk.get(slug, chunk) @@ -87,7 +89,9 @@ def editor(request, slug, chunk=None, template_name='wiki/bootstrap.html'): 'document_id': chunk.id, 'title': chunk.book.title, 'history': get_history(chunk), - 'version': chunk.revision() + 'version': chunk.revision(), + 'stage': chunk.stage.name if chunk.stage else None, + 'assignment': chunk.user.username if chunk.user else None }), 'serialized_templates': simplejson.dumps([ {'id': t.id, 'name': t.name, 'content': t.content} for t in Template.objects.filter(is_partial=True) @@ -98,6 +102,7 @@ def editor(request, slug, chunk=None, template_name='wiki/bootstrap.html'): }, 'tags': list(save_form.fields['stage_completed'].choices), 'can_pubmark': request.user.has_perm('catalogue.can_pubmark'), + 'slug': chunk.book.slug }) @@ -167,8 +172,9 @@ def text(request, chunk_id): revision = doc.revision() return JSONResponse({ 'text': doc.materialize() if parent_revision != revision else None, - 'meta': {}, 'version': revision, + 'stage': doc.stage.name if doc.stage else None, + 'assignment': doc.user.username if doc.user else None }) else: return JSONFormInvalid(form) @@ -217,7 +223,6 @@ def revert(request, chunk_id): return JSONResponse({ 'document': doc.materialize() if before != doc.revision() else None, - 'meta': {}, 'version': doc.revision(), }) else: