X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/d64a8451dafc98e8f71455a55d123d22f3368ef9..4ee58649c86d9c4bd4ac89dd46325d0a1c443122:/apps/wiki/views.py diff --git a/apps/wiki/views.py b/apps/wiki/views.py index 9b7d8076..69c98365 100644 --- a/apps/wiki/views.py +++ b/apps/wiki/views.py @@ -1,47 +1,64 @@ 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 +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 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 +def normalized_name(view): + + @functools.wraps(view) + def decorated(request, name, *args): + normalized = normalize_name(name) + logger.debug('View check %r -> %r', name, normalized) + + if normalized != name: + return http.HttpResponseRedirect( + reverse('wiki_' + view.__name__, kwargs={'name': normalized})) + + return view(request, name, *args) + + return decorated + + @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(), +def document_list(request): + return direct_to_template(request, 'wiki/document_list.html', extra_context={ + 'docs': getstorage().all(), 'last_docs': sorted(request.session.get("wiki_last_docs", {}).items(), key=operator.itemgetter(1), reverse=True), }) @never_cache -def document_detail(request, name, template_name='wiki/document_details.html'): +@normalized_name +def editor(request, name, template_name='wiki/document_details.html'): storage = getstorage() try: @@ -70,7 +87,37 @@ def document_detail(request, name, template_name='wiki/document_details.html'): }) -def document_create_missing(request, name): +@require_GET +@normalized_name +def editor_readonly(request, name, template_name='wiki/document_details_readonly.html'): + name = normalize_name(name) + storage = getstorage() + + try: + revision = request.GET['revision'] + document = storage.get(name, revision) + except (KeyError, DocumentNotFound) as e: + raise http.Http404 + + access_time = datetime.now() + last_documents = request.session.get("wiki_last_docs", {}) + last_documents[name] = access_time + + 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': dict(document.info(), readonly=True), + 'document_meta': document.meta, + }) + + +@normalized_name +def create_missing(request, name): storage = getstorage() if request.method == "POST": @@ -95,7 +142,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': @@ -107,12 +155,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({ @@ -145,7 +195,7 @@ def document_text(request, name): @never_cache -def document_gallery(request, directory): +def gallery(request, directory): try: base_url = ''.join(( smart_unicode(settings.MEDIA_URL), @@ -172,7 +222,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)) @@ -192,7 +243,8 @@ def document_diff(request, name): @never_cache -def document_history(request, name): +@normalized_name +def history(request, name): storage = getstorage() # TODO: pagination @@ -203,7 +255,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") @@ -219,7 +272,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")