X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/0c502601ba7d9e9ee0a4d6a543c534edfad9c22e..7089218234f372577f6efd65e857d18223f71bc5:/apps/wiki/views.py diff --git a/apps/wiki/views.py b/apps/wiki/views.py index 2bb168fe..827a4838 100644 --- a/apps/wiki/views.py +++ b/apps/wiki/views.py @@ -16,7 +16,7 @@ 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 catalogue.models import Book, Chunk +from catalogue.models import Book, Chunk, Template import nice_diff from wiki import forms from wiki.helpers import (JSONResponse, JSONFormInvalid, JSONServerError, @@ -87,14 +87,20 @@ 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) + ]), 'forms': { "text_save": save_form, "text_revert": forms.DocumentTextRevertForm(prefix="textrevert") }, 'tags': list(save_form.fields['stage_completed'].choices), 'can_pubmark': request.user.has_perm('catalogue.can_pubmark'), + 'slug': chunk.book.slug }) @@ -164,8 +170,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) @@ -213,9 +220,8 @@ def revert(request, chunk_id): doc.at_revision(revision).revert(author=author, description=comment) return JSONResponse({ - 'text': doc.materialize() if before != doc.revision() else None, - 'meta': {}, - 'revision': doc.revision(), + 'document': doc.materialize() if before != doc.revision() else None, + 'version': doc.revision(), }) else: return JSONFormInvalid(form)