X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/36f6233fd79390ad5af8a1532eac60a0ae57c825..3b2e2e72969a9fa2246774ae2f01bd60a4cd81de:/apps/wiki/views.py diff --git a/apps/wiki/views.py b/apps/wiki/views.py index 46f0665f..451034dc 100644 --- a/apps/wiki/views.py +++ b/apps/wiki/views.py @@ -1,77 +1,60 @@ import os +import functools +import logging +logger = logging.getLogger("fnp.wiki") from django.conf import settings from django.views.generic.simple import direct_to_template from django.views.decorators.http import require_POST, require_GET from django.core.urlresolvers import reverse -from wiki.helpers import JSONResponse, JSONFormInvalid, JSONServerError, ajax_require_permission +from wiki.helpers import (JSONResponse, JSONFormInvalid, JSONServerError, + ajax_require_permission, recursive_groupby) from django import http -from wiki.models import getstorage, DocumentNotFound +from django.contrib.auth.decorators import login_required + +from wiki.models import getstorage, DocumentNotFound, normalize_name, split_name, join_name from wiki.forms import DocumentTextSaveForm, DocumentTagForm, DocumentCreateForm from datetime import datetime from django.utils.encoding import smart_unicode from django.utils.translation import ugettext_lazy as _ -import wlapi # # Quick hack around caching problems, TODO: use ETags # from django.views.decorators.cache import never_cache -import logging -logger = logging.getLogger("fnp.peanut.api") - +import wlapi import nice_diff import operator MAX_LAST_DOCS = 10 -@never_cache -def document_list(request, template_name='wiki/document_list.html'): - # TODO: find a way to cache "Storage All" - return direct_to_template(request, template_name, extra_context={ - 'document_list': getstorage().all(), - 'last_docs': sorted(request.session.get("wiki_last_docs", {}).items(), - key=operator.itemgetter(1), reverse=True), - }) +def normalized_name(view): + @functools.wraps(view) + def decorated(request, name, *args): + normalized = normalize_name(name) + logger.debug('View check %r -> %r', name, normalized) -@never_cache -def document_detail(request, name, template_name='wiki/document_details.html'): - storage = getstorage() + if normalized != name: + return http.HttpResponseRedirect( + reverse('wiki_' + view.__name__, kwargs={'name': normalized})) - try: - document = storage.get(name) - except DocumentNotFound: - return http.HttpResponseRedirect(reverse("wiki_create_missing", args=[name])) + return view(request, name, *args) - access_time = datetime.now() - last_documents = request.session.get("wiki_last_docs", {}) - last_documents[name] = access_time + return decorated - if len(last_documents) > MAX_LAST_DOCS: - oldest_key = min(last_documents, key=last_documents.__getitem__) - del last_documents[oldest_key] - request.session['wiki_last_docs'] = last_documents - return direct_to_template(request, template_name, extra_context={ - 'document': document, - 'document_name': document.name, - 'document_info': document.info, - 'document_meta': document.meta, - 'forms': { - "text_save": DocumentTextSaveForm(prefix="textsave"), - "add_tag": DocumentTagForm(prefix="addtag"), - }, - }) @require_GET -def document_detail_readonly(request, name, template_name='wiki/document_details_readonly.html'): +@normalized_name +def editor_readonly(request, name, template_name='wiki/document_details_readonly.html'): + name = normalize_name(name) storage = getstorage() try: @@ -97,18 +80,19 @@ def document_detail_readonly(request, name, template_name='wiki/document_details }) -def document_create_missing(request, name): +@normalized_name +def create_missing(request, name): storage = getstorage() if request.method == "POST": form = DocumentCreateForm(request.POST, request.FILES) if form.is_valid(): doc = storage.create_document( - id=form.cleaned_data['id'], + name=form.cleaned_data['id'], text=form.cleaned_data['text'], ) - return http.HttpResponseRedirect(reverse("wiki_details", args=[doc.name])) + return http.HttpResponseRedirect(reverse("wiki_editor", args=[doc.name])) else: form = DocumentCreateForm(initial={ "id": name.replace(" ", "_"), @@ -122,7 +106,8 @@ def document_create_missing(request, name): @never_cache -def document_text(request, name): +@normalized_name +def text(request, name): storage = getstorage() if request.method == 'POST': @@ -134,12 +119,14 @@ def document_text(request, name): document = storage.get_or_404(name, revision) document.text = form.cleaned_data['text'] - storage.put(document, - author=form.cleaned_data['author'] or request.user.username, - comment=form.cleaned_data['comment'], - parent=revision, - ) + comment = form.cleaned_data['comment'] + + if form.cleaned_data['stage_completed']: + comment += '\n#stage-finished: %s\n' % form.cleaned_data['stage_completed'] + + author = "%s <%s>" % (form.cleaned_data['author_name'], form.cleaned_data['author_email']) + storage.put(document, author=author, comment=comment, parent=revision) document = storage.get(name) return JSONResponse({ @@ -172,7 +159,25 @@ def document_text(request, name): @never_cache -def document_gallery(request, directory): +@normalized_name +@require_POST +def revert(request, name): + storage = getstorage() + revision = request.POST['target_revision'] + + try: + document = storage.revert(name, revision) + + return JSONResponse({ + 'text': document.plain_text if revision != document.revision else None, + 'meta': document.meta(), + 'revision': document.revision, + }) + except DocumentNotFound: + raise http.Http404 + +@never_cache +def gallery(request, directory): try: base_url = ''.join(( smart_unicode(settings.MEDIA_URL), @@ -199,7 +204,8 @@ def document_gallery(request, directory): @never_cache -def document_diff(request, name): +@normalized_name +def diff(request, name): storage = getstorage() revA = int(request.GET.get('from', 0)) @@ -219,7 +225,8 @@ def document_diff(request, name): @never_cache -def document_history(request, name): +@normalized_name +def history(request, name): storage = getstorage() # TODO: pagination @@ -230,7 +237,8 @@ def document_history(request, name): @require_POST @ajax_require_permission('wiki.can_change_tags') -def document_add_tag(request, name): +def add_tag(request, name): + name = normalize_name(name) storage = getstorage() form = DocumentTagForm(request.POST, prefix="addtag") @@ -246,7 +254,9 @@ def document_add_tag(request, name): @require_POST @ajax_require_permission('wiki.can_publish') -def document_publish(request, name): +def publish(request, name): + name = normalize_name(name) + storage = getstorage() document = storage.get_by_tag(name, "ready_to_publish") @@ -256,3 +266,8 @@ def document_publish(request, name): return JSONResponse({"result": api.publish_book(document)}) except wlapi.APICallException, e: return JSONServerError({"message": str(e)}) + +@login_required +def status_report(request): + pass +