X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/24817832933e76ec501753bb23d680995b3af7a1..521599e068275e44ceffd240e34e7c6701bcaf42:/apps/wiki/views.py?ds=inline diff --git a/apps/wiki/views.py b/apps/wiki/views.py index bd9e2c57..d37801f2 100644 --- a/apps/wiki/views.py +++ b/apps/wiki/views.py @@ -1,7 +1,9 @@ +# -*- coding: utf-8 -*- from datetime import datetime import os import logging import urllib +import json from django.conf import settings from django.core.urlresolvers import reverse @@ -14,13 +16,11 @@ from django.utils.formats import localize 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 catalogue.models import Book, Chunk, Template import nice_diff from wiki import forms -from wiki.helpers import (JSONResponse, JSONFormInvalid, JSONServerError, - ajax_require_permission) +from wiki.helpers import JSONResponse, JSONFormInvalid, ajax_require_permission from wiki.models import Theme # @@ -43,14 +43,16 @@ def get_history(chunk): "date": localize(change.created_at), "publishable": _("Publishable") + "\n" if change.publishable else "", "tag": ',\n'.join(unicode(tag) for tag in change.tags.all()), - "published": _("Published") + ": " + \ - localize(change.publish_log.order_by('-book_record__timestamp')[0].book_record.timestamp) \ - if change.publish_log.exists() else "", + "published": ( + _("Published") + ": " + + localize(change.publish_log.order_by('-book_record__timestamp')[0].book_record.timestamp) + if change.publish_log.exists() else ""), }) return changes @never_cache +# @login_required def editor(request, slug, chunk=None, template_name='wiki/bootstrap.html'): try: chunk = Chunk.get(slug, chunk) @@ -80,16 +82,26 @@ def editor(request, slug, chunk=None, template_name='wiki/bootstrap.html'): del last_books[oldest_key] request.session['wiki_last_books'] = last_books - save_form = forms.DocumentTextSaveForm(user=request.user, prefix="textsave") + save_form = forms.DocumentTextSaveForm(user=request.user, chunk=chunk, prefix="textsave") + try: + version = int(request.GET.get('version', None)) + except: + version = None + if version: + text = chunk.at_revision(version).materialize() + else: + text = chunk.materialize() return render(request, template_name, { - 'serialized_document_data': simplejson.dumps({ - 'document': chunk.materialize(), + 'serialized_document_data': json.dumps({ + 'document': text, 'document_id': chunk.id, 'title': chunk.book.title, 'history': get_history(chunk), - 'version': chunk.revision() + 'version': version or chunk.revision(), + 'stage': chunk.stage.name if chunk.stage else None, + 'assignment': chunk.user.username if chunk.user else None }), - 'serialized_templates': simplejson.dumps([ + 'serialized_templates': json.dumps([ {'id': t.id, 'name': t.name, 'content': t.content} for t in Template.objects.filter(is_partial=True) ]), 'forms': { @@ -98,6 +110,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 }) @@ -139,42 +152,22 @@ def text(request, chunk_id): return HttpResponseForbidden("Not authorized.") if request.method == 'POST': - form = forms.DocumentTextSaveForm(request.POST, user=request.user, prefix="textsave") + form = forms.DocumentTextSaveForm(request.POST, user=request.user, chunk=doc, prefix="textsave") if form.is_valid(): - if request.user.is_authenticated(): - author = request.user - else: - author = None - text = form.cleaned_data['text'] + form.save() parent_revision = form.cleaned_data['parent_revision'] - if parent_revision is not None: - parent = doc.at_revision(parent_revision) - else: - parent = None - stage = form.cleaned_data['stage_completed'] - tags = [stage] if stage else [] - publishable = (form.cleaned_data['publishable'] and - request.user.has_perm('catalogue.can_pubmark')) - doc.commit(author=author, - text=text, - parent=parent, - description=form.cleaned_data['comment'], - tags=tags, - author_name=form.cleaned_data['author_name'], - author_email=form.cleaned_data['author_email'], - publishable=publishable, - ) 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) else: revision = request.GET.get("revision", None) - + try: revision = int(revision) except (ValueError, TypeError): @@ -217,7 +210,6 @@ def revert(request, chunk_id): return JSONResponse({ 'document': doc.materialize() if before != doc.revision() else None, - 'meta': {}, 'version': doc.revision(), }) else: @@ -241,7 +233,7 @@ def gallery(request, directory): return urllib.quote("%s/%s" % (base_url, smart_unicode(filename))) def is_image(filename): - return os.path.splitext(f)[1].lower() in (u'.jpg', u'.jpeg', u'.png') + return os.path.splitext(filename)[1].lower() in (u'.jpg', u'.jpeg', u'.png') images = [map_to_url(f) for f in map(smart_unicode, os.listdir(base_dir)) if is_image(f)] images.sort() @@ -277,8 +269,7 @@ def diff(request, chunk_id): docA = "" docB = doc.at_revision(revB).materialize() - return http.HttpResponse(nice_diff.html_diff_table(docA.splitlines(), - docB.splitlines(), context=3)) + return http.HttpResponse(nice_diff.html_diff_table(docA.splitlines(), docB.splitlines(), context=3)) @never_cache