X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/43116c58e5c56f94ef358a5a17fb13a252e02531..f0eb06f2aab3d3b51d1b11b6df19e2a971d5c5c3:/apps/wiki/views.py?ds=inline diff --git a/apps/wiki/views.py b/apps/wiki/views.py index f7078922..461f1109 100644 --- a/apps/wiki/views.py +++ b/apps/wiki/views.py @@ -1,25 +1,30 @@ -from datetime import datetime +# -*- coding: utf-8 -*- +# +# This file is part of MIL/PEER, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. +# +import json import os import logging +import urllib from django.conf import settings -from django.core.urlresolvers import reverse from django import http -from django.http import Http404, HttpResponseForbidden +from django.http import HttpResponseForbidden from django.middleware.gzip import GZipMiddleware from django.utils.decorators import decorator_from_middleware from django.utils.encoding import smart_unicode from django.utils.formats import localize +from django.utils.html import escape from django.utils.translation import ugettext as _ -from django.views.decorators.http import require_POST, require_GET +from django.views.decorators.http import require_POST from django.shortcuts import get_object_or_404, render -from catalogue.models import Book, Chunk +from catalogue.models import Document, Template +from dvcs.models import Revision import nice_diff from wiki import forms -from wiki.helpers import (JSONResponse, JSONFormInvalid, JSONServerError, - ajax_require_permission) -from wiki.models import Theme +from wiki.helpers import JSONResponse, JSONFormInvalid # # Quick hack around caching problems, TODO: use ETags @@ -31,84 +36,60 @@ logger = logging.getLogger("fnp.wiki") MAX_LAST_DOCS = 10 -@never_cache -def editor(request, slug, chunk=None, template_name='wiki/document_details.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) - except Book.DoesNotExist: - return http.HttpResponseRedirect(reverse("catalogue_create_missing", args=[slug])) - else: - raise Http404 - if not chunk.book.accessible(request): - return HttpResponseForbidden("Not authorized.") +def get_history(document): + revisions = [] + for i, revision in enumerate(document.history()): + revisions.append({ + "version": i + 1, + "description": revision.description, + "author": escape(revision.author_str()), + "date": localize(revision.created_at), + "revision": revision.pk, + "published": _("Published") + ": " + + localize(revision.publish_log.order_by('-timestamp')[0].timestamp) + if revision.publish_log.exists() else "", + }) + return revisions - access_time = datetime.now() - last_books = request.session.get("wiki_last_books", {}) - 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 +@never_cache +def editor(request, pk, template_name='wiki/bootstrap.html'): + doc = get_object_or_404(Document, pk=pk, deleted=False) + save_form = forms.DocumentTextSaveForm(user=request.user, prefix="textsave") + text = doc.materialize() + revision = doc.revision + history = get_history(doc) return render(request, template_name, { - 'chunk': chunk, + 'serialized_document_data': json.dumps({ + 'document': text, + 'document_id': doc.pk, + 'title': doc.meta().get('title', ''), + 'history': history, + 'version': len(history), + 'revision': revision.pk, + 'stage': doc.stage, + 'stage_name': doc.stage_name(), + 'assignment': doc.assigned_to.username if doc.assigned_to 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_save": save_form, "text_revert": forms.DocumentTextRevertForm(prefix="textrevert"), - "pubmark": forms.DocumentPubmarkForm(prefix="pubmark"), + "text_publish": forms.DocumentTextPublishForm(prefix="textpublish"), }, - 'can_pubmark': request.user.has_perm('catalogue.can_pubmark'), - 'REDMINE_URL': settings.REDMINE_URL, - }) - - -@require_GET -def editor_readonly(request, slug, chunk=None, template_name='wiki/document_details_readonly.html'): - try: - chunk = Chunk.get(slug, chunk) - revision = request.GET['revision'] - except (Chunk.MultipleObjectsReturned, Chunk.DoesNotExist, KeyError): - raise Http404 - if not chunk.book.accessible(request): - return HttpResponseForbidden("Not authorized.") - - access_time = datetime.now() - last_books = request.session.get("wiki_last_books", {}) - last_books[slug, chunk.slug] = { - 'time': access_time, - 'title': chunk.book.title, - } - - 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 render(request, template_name, { - 'chunk': chunk, - 'revision': revision, - 'readonly': True, - 'REDMINE_URL': settings.REDMINE_URL, + 'pk': doc.pk, }) @never_cache @decorator_from_middleware(GZipMiddleware) -def text(request, chunk_id): - doc = get_object_or_404(Chunk, pk=chunk_id) - if not doc.book.accessible(request): - return HttpResponseForbidden("Not authorized.") +def text(request, doc_id): + doc = get_object_or_404(Document, pk=doc_id, deleted=False) + # if not doc.book.accessible(request): + # return HttpResponseForbidden("Not authorized.") if request.method == 'POST': form = forms.DocumentTextSaveForm(request.POST, user=request.user, prefix="textsave") @@ -118,29 +99,34 @@ def text(request, chunk_id): else: author = None text = form.cleaned_data['text'] - 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() + # 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'] + # tags = [stage] if stage else [] + # publishable = (form.cleaned_data['publishable'] and + # request.user.has_perm('catalogue.can_pubmark')) + try: + doc.commit( + author=author, + text=text, + description=form.cleaned_data['comment'], + author_name=form.cleaned_data['author_name'], + author_email=form.cleaned_data['author_email'], + ) + doc.set_stage(stage) + except: + from traceback import print_exc + print_exc() + raise return JSONResponse({ - 'text': doc.materialize() if parent_revision != revision else None, - 'meta': {}, - 'revision': revision, + 'text': None, # doc.materialize() if parent_revision != revision else None, + 'version': len(get_history(doc)), + 'stage': doc.stage, + 'stage_name': doc.stage_name(), + 'assignment': doc.assigned_to.username if doc.assigned_to else None }) else: return JSONFormInvalid(form) @@ -166,31 +152,37 @@ def text(request, chunk_id): @never_cache @require_POST -def revert(request, chunk_id): +def revert(request, doc_id): form = forms.DocumentTextRevertForm(request.POST, prefix="textrevert") if form.is_valid(): - doc = get_object_or_404(Chunk, pk=chunk_id) - if not doc.book.accessible(request): - return HttpResponseForbidden("Not authorized.") - - revision = form.cleaned_data['revision'] + doc = get_object_or_404(Document, pk=doc_id, deleted=False) + rev = get_object_or_404(Revision, pk=form.cleaned_data['revision']) comment = form.cleaned_data['comment'] - comment += "\n#revert to %s" % revision + comment += "\n#revert to %s" % rev.pk if request.user.is_authenticated(): author = request.user else: author = None - before = doc.revision() - logger.info("Reverting %s to %s", chunk_id, revision) - doc.at_revision(revision).revert(author=author, description=comment) + # before = doc.revision + logger.info("Reverting %s to %s", doc_id, rev.pk) + + doc.commit( + author=author, + text=rev.materialize(), + description=comment, + # author_name=form.cleaned_data['author_name'], #? + # author_email=form.cleaned_data['author_email'], #? + ) return JSONResponse({ - 'text': doc.materialize() if before != doc.revision() else None, - 'meta': {}, - 'revision': doc.revision(), + 'document': doc.materialize(), + 'version': len(get_history(doc)), + 'stage': doc.stage, + 'stage_name': doc.stage_name(), + 'assignment': doc.assigned_to.username if doc.assigned_to else None, }) else: return JSONFormInvalid(form) @@ -198,6 +190,9 @@ def revert(request, chunk_id): @never_cache def gallery(request, directory): + if not request.user.is_authenticated(): + return HttpResponseForbidden("Not authorized.") + try: base_url = ''.join(( smart_unicode(settings.MEDIA_URL), @@ -210,7 +205,7 @@ def gallery(request, directory): 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') @@ -218,9 +213,6 @@ def gallery(request, directory): images = [map_to_url(f) for f in map(smart_unicode, os.listdir(base_dir)) if is_image(f)] images.sort() - if not request.user.is_authenticated(): - return HttpResponseForbidden("Not authorized.") - return JSONResponse(images) except (IndexError, OSError): logger.exception("Unable to fetch gallery") @@ -228,7 +220,7 @@ def gallery(request, directory): @never_cache -def diff(request, chunk_id): +def diff(request, doc_id): revA = int(request.GET.get('from', 0)) revB = int(request.GET.get('to', 0)) @@ -238,70 +230,23 @@ def diff(request, chunk_id): if revB == 0: revB = None - doc = get_object_or_404(Chunk, pk=chunk_id) - if not doc.book.accessible(request): - return HttpResponseForbidden("Not authorized.") + # TODO: check if revisions in line. + + doc = get_object_or_404(Document, pk=doc_id, deleted=False) # allow diff from the beginning if revA: - docA = doc.at_revision(revA).materialize() + docA = Revision.objects.get(pk=revA).materialize() else: docA = "" - docB = doc.at_revision(revB).materialize() - - return http.HttpResponse(nice_diff.html_diff_table(docA.splitlines(), - docB.splitlines(), context=3)) - + docB = Revision.objects.get(pk=revB).materialize() -@never_cache -def revision(request, chunk_id): - doc = get_object_or_404(Chunk, pk=chunk_id) - if not doc.book.accessible(request): - return HttpResponseForbidden("Not authorized.") - return http.HttpResponse(str(doc.revision())) + return http.HttpResponse(nice_diff.html_diff_table(docA.splitlines(), docB.splitlines(), context=3)) @never_cache -def history(request, chunk_id): +def history(request, doc_id): # TODO: pagination - doc = get_object_or_404(Chunk, pk=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) - - -@require_POST -@ajax_require_permission('catalogue.can_pubmark') -def pubmark(request, chunk_id): - form = forms.DocumentPubmarkForm(request.POST, prefix="pubmark") - if form.is_valid(): - doc = get_object_or_404(Chunk, pk=chunk_id) - if not doc.book.accessible(request): - return HttpResponseForbidden("Not authorized.") - - revision = form.cleaned_data['revision'] - publishable = form.cleaned_data['publishable'] - change = doc.at_revision(revision) - if publishable != change.publishable: - change.set_publishable(publishable) - return JSONResponse({"message": _("Revision marked")}) - else: - return JSONResponse({"message": _("Nothing changed")}) - else: - return JSONFormInvalid(form) - + doc = get_object_or_404(Document, pk=doc_id, deleted=False) -def themes(request): - prefix = request.GET.get('q', '') - return http.HttpResponse('\n'.join([str(t) for t in Theme.objects.filter(name__istartswith=prefix)])) + return JSONResponse(get_history(doc))