X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/d64a8451dafc98e8f71455a55d123d22f3368ef9..a5103645ffd3cb707677aa733bfbee3c2738f87f:/apps/wiki/views.py diff --git a/apps/wiki/views.py b/apps/wiki/views.py index 9b7d8076..1539bafc 100644 --- a/apps/wiki/views.py +++ b/apps/wiki/views.py @@ -3,7 +3,7 @@ import os 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 django import http @@ -70,6 +70,33 @@ def document_detail(request, name, template_name='wiki/document_details.html'): }) +@require_GET +def document_detail_readonly(request, name, template_name='wiki/document_details_readonly.html'): + 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, + }) + + def document_create_missing(request, name): storage = getstorage() @@ -107,12 +134,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({