X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/d05a1d784f2f0dbad6839c672cae8226d1b0fa9d..de73425f8a37835f8778fbcfd81c41493781f46a:/apps/wiki/views.py diff --git a/apps/wiki/views.py b/apps/wiki/views.py index 0356d509..f9a253c1 100644 --- a/apps/wiki/views.py +++ b/apps/wiki/views.py @@ -1,6 +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 @@ -12,14 +15,12 @@ from django.utils.encoding import smart_unicode 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.views.generic.simple import direct_to_template -from django.shortcuts import get_object_or_404 +from django.shortcuts import get_object_or_404, render -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, - ajax_require_permission) +from wiki.helpers import JSONResponse, JSONFormInvalid, ajax_require_permission from wiki.models import Theme # @@ -32,19 +33,38 @@ logger = logging.getLogger("fnp.wiki") MAX_LAST_DOCS = 10 +def get_history(chunk): + changes = [] + for change in chunk.history(): + changes.append({ + "version": change.revision, + "description": change.description, + "author": change.author_str(), + "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 ""), + }) + return changes + + @never_cache -def editor(request, slug, chunk=None, template_name='wiki/document_details.html'): +def editor(request, slug, chunk=None, template_name='wiki/bootstrap.html'): try: chunk = Chunk.get(slug, chunk) except Chunk.MultipleObjectsReturned: - # TODO: choice page raise Http404 except Chunk.DoesNotExist: if chunk is None: try: - book = Book.objects.get(slug=slug) + Book.objects.get(slug=slug) except Book.DoesNotExist: return http.HttpResponseRedirect(reverse("catalogue_create_missing", args=[slug])) + else: + raise Http404 else: raise Http404 if not chunk.book.accessible(request): @@ -55,22 +75,47 @@ def editor(request, slug, chunk=None, template_name='wiki/document_details.html' last_books[slug, chunk.slug] = { 'time': access_time, 'title': chunk.pretty_name(), - } + } if len(last_books) > MAX_LAST_DOCS: oldest_key = min(last_books, key=lambda x: last_books[x]['time']) del last_books[oldest_key] request.session['wiki_last_books'] = last_books - return direct_to_template(request, template_name, extra_context={ - 'chunk': chunk, + save_form = forms.DocumentTextSaveForm(user=request.user, chunk=chunk, prefix="textsave") + try: + version = int(request.GET.get('version', '')) + except ValueError: + version = None + if version: + text = chunk.at_revision(version).materialize() + else: + text = chunk.materialize() + gallery_dir = os.path.join(settings.MEDIA_ROOT, settings.IMAGE_DIR, chunk.book.gallery) + materials = set(os.listdir(gallery_dir)) if os.path.isdir(gallery_dir) else set() + materials.update([n.rsplit('.', 1)[0] for n in materials]) + return render(request, template_name, { + 'serialized_document_data': json.dumps({ + 'document': text, + 'document_id': chunk.id, + 'title': chunk.book.title, + 'history': get_history(chunk), + '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': json.dumps([ + {'id': t.id, 'name': t.name, 'content': t.content} for t in Template.objects.filter(is_partial=True) + ]), 'forms': { - "text_save": forms.DocumentTextSaveForm(user=request.user, prefix="textsave"), - "text_revert": forms.DocumentTextRevertForm(prefix="textrevert"), - "pubmark": forms.DocumentPubmarkForm(prefix="pubmark"), + "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'), - 'REDMINE_URL': settings.REDMINE_URL, + 'slug': chunk.book.slug, + 'gallery': chunk.book.gallery, + 'materials': json.dumps(list(materials)), }) @@ -96,7 +141,7 @@ def editor_readonly(request, slug, chunk=None, template_name='wiki/document_deta del last_books[oldest_key] request.session['wiki_last_books'] = last_books - return direct_to_template(request, template_name, extra_context={ + return render(request, template_name, { 'chunk': chunk, 'revision': revision, 'readonly': True, @@ -112,42 +157,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': {}, - 'revision': revision, + '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): @@ -189,9 +214,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) @@ -202,19 +226,19 @@ def gallery(request, directory): try: base_url = ''.join(( smart_unicode(settings.MEDIA_URL), - smart_unicode(settings.FILEBROWSER_DIRECTORY), + smart_unicode(settings.IMAGE_DIR), smart_unicode(directory))) base_dir = os.path.join( smart_unicode(settings.MEDIA_ROOT), - smart_unicode(settings.FILEBROWSER_DIRECTORY), + smart_unicode(settings.IMAGE_DIR), smart_unicode(directory)) def map_to_url(filename): - return "%s/%s" % (base_url, smart_unicode(filename)) + 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() @@ -250,8 +274,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 @@ -269,17 +292,7 @@ def history(request, chunk_id): if not doc.book.accessible(request): return HttpResponseForbidden("Not authorized.") - changes = [] - for change in doc.history().reverse(): - changes.append({ - "version": change.revision, - "description": change.description, - "author": change.author_str(), - "date": localize(change.created_at), - "publishable": _("Publishable") + "\n" if change.publishable else "", - "tag": ',\n'.join(unicode(tag) for tag in change.tags.all()), - }) - return JSONResponse(changes) + return JSONResponse(get_history(doc)) @require_POST