X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/cbb14d2ed3eb0b72a6c3c68ab93847923e6142f4..f7135da39f77154495d308d05c46e7b30e964d2d:/apps/wiki/views.py?ds=sidebyside diff --git a/apps/wiki/views.py b/apps/wiki/views.py index 6f09ddd6..f9594261 100644 --- a/apps/wiki/views.py +++ b/apps/wiki/views.py @@ -1,214 +1,141 @@ +from datetime import datetime import os import logging -logger = logging.getLogger("fnp.wiki") +import urllib 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, recursive_groupby) from django import http -from django.shortcuts import get_object_or_404, redirect - -from wiki.models import Book, Theme -from wiki.forms import DocumentTextSaveForm, DocumentTextRevertForm, DocumentTagForm, DocumentCreateForm, DocumentsUploadForm -from datetime import datetime -from django.utils.encoding import smart_unicode -from django.utils.translation import ugettext_lazy as _ -from django.utils.decorators import decorator_from_middleware +from django.http import Http404, 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.translation import ugettext as _ +from django.views.decorators.http import require_POST, require_GET +from django.shortcuts import get_object_or_404, render +from catalogue.models import Book, Chunk +import nice_diff +from wiki import forms +from wiki.helpers import (JSONResponse, JSONFormInvalid, JSONServerError, + ajax_require_permission) +from wiki.models import Theme # # Quick hack around caching problems, TODO: use ETags # from django.views.decorators.cache import never_cache -import nice_diff -import operator +logger = logging.getLogger("fnp.wiki") MAX_LAST_DOCS = 10 @never_cache -def document_list(request): - return direct_to_template(request, 'wiki/document_list.html', extra_context={ - 'books': Book.objects.all(), - 'last_books': sorted(request.session.get("wiki_last_books", {}).items(), - key=lambda x: x[1]['time'], reverse=True), - }) - - -@never_cache -def editor(request, slug, template_name='wiki/document_details.html'): +def editor(request, slug, chunk=None, template_name='wiki/document_details.html'): try: - book = Book.objects.get(slug=slug) - except Book.DoesNotExist: - return http.HttpResponseRedirect(reverse("wiki_create_missing", args=[slug])) + 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.") access_time = datetime.now() last_books = request.session.get("wiki_last_books", {}) - last_books[slug] = { + last_books[slug, chunk.slug] = { 'time': access_time, - 'title': book.title, + 'title': chunk.pretty_name(), } if len(last_books) > MAX_LAST_DOCS: - oldest_key = min(last_books, key=operator.itemgetter('time')) + 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={ - 'book': book, + return render(request, template_name, { + 'chunk': chunk, 'forms': { - "text_save": DocumentTextSaveForm(prefix="textsave"), - "text_revert": DocumentTextRevertForm(prefix="textrevert"), - "add_tag": DocumentTagForm(prefix="addtag"), + "text_save": forms.DocumentTextSaveForm(user=request.user, prefix="textsave"), + "text_revert": forms.DocumentTextRevertForm(prefix="textrevert"), + "pubmark": forms.DocumentPubmarkForm(prefix="pubmark"), }, + 'can_pubmark': request.user.has_perm('catalogue.can_pubmark'), 'REDMINE_URL': settings.REDMINE_URL, }) @require_GET -def editor_readonly(request, slug, template_name='wiki/document_details_readonly.html'): +def editor_readonly(request, slug, chunk=None, template_name='wiki/document_details_readonly.html'): try: - book = Book.objects.get(slug=slug) + chunk = Chunk.get(slug, chunk) revision = request.GET['revision'] - except KeyError: - raise http.Http404 + 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] = { + last_books[slug, chunk.slug] = { 'time': access_time, - 'title': book.title, + 'title': chunk.book.title, } if len(last_books) > MAX_LAST_DOCS: - oldest_key = min(last_books, key=operator.itemgetter('time')) + 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={ - 'book': book, + return render(request, template_name, { + 'chunk': chunk, 'revision': revision, 'readonly': True, 'REDMINE_URL': settings.REDMINE_URL, }) -def create_missing(request, slug): - slug = slug.replace(' ', '-') - - if request.method == "POST": - form = DocumentCreateForm(request.POST, request.FILES) - if form.is_valid(): - - if request.user.is_authenticated(): - creator = request.user - else: - creator = None - book = Book.create(creator=creator, - slug=form.cleaned_data['slug'], - title=form.cleaned_data['title'], - text=form.cleaned_data['text'], - ) - - return http.HttpResponseRedirect(reverse("wiki_editor", args=[book.slug])) - else: - form = DocumentCreateForm(initial={ - "slug": slug, - "title": slug.replace('-', ' ').title(), - }) - - return direct_to_template(request, "wiki/document_create_missing.html", extra_context={ - "slug": slug, - "form": form, - }) - - -def upload(request): - if request.method == "POST": - form = DocumentsUploadForm(request.POST, request.FILES) - if form.is_valid(): - import slughifi - - if request.user.is_authenticated(): - creator = request.user - else: - creator = None - - zip = form.cleaned_data['zip'] - skipped_list = [] - ok_list = [] - error_list = [] - slugs = {} - existing = [book.slug for book in Book.objects.all()] - for filename in zip.namelist(): - if filename[-1] == '/': - continue - title = os.path.basename(filename)[:-4] - slug = slughifi(title) - if not (slug and filename.endswith('.xml')): - skipped_list.append(filename) - elif slug in slugs: - error_list.append((filename, slug, _('Slug already used for %s' % slugs[slug]))) - elif slug in existing: - error_list.append((filename, slug, _('Slug already used in repository.'))) - else: - try: - zip.read(filename).decode('utf-8') # test read - ok_list.append((filename, slug, title)) - except UnicodeDecodeError: - error_list.append((filename, title, _('File should be UTF-8 encoded.'))) - slugs[slug] = filename - - if not error_list: - for filename, slug, title in ok_list: - Book.create(creator=creator, - slug=slug, - title=title, - text=zip.read(filename).decode('utf-8'), - ) - - return direct_to_template(request, "wiki/document_upload.html", extra_context={ - "form": form, - "ok_list": ok_list, - "skipped_list": skipped_list, - "error_list": error_list, - }) - else: - form = DocumentsUploadForm() - - return direct_to_template(request, "wiki/document_upload.html", extra_context={ - "form": form, - }) - - @never_cache @decorator_from_middleware(GZipMiddleware) -def text(request, slug): - doc = get_object_or_404(Book, slug=slug).doc +def text(request, chunk_id): + doc = get_object_or_404(Chunk, pk=chunk_id) + if not doc.book.accessible(request): + return HttpResponseForbidden("Not authorized.") if request.method == 'POST': - form = DocumentTextSaveForm(request.POST, prefix="textsave") + form = forms.DocumentTextSaveForm(request.POST, user=request.user, prefix="textsave") if form.is_valid(): - # TODO: - # - stage completion should be stored (as a relation) - if request.user.is_authenticated(): author = request.user else: author = None text = form.cleaned_data['text'] parent_revision = form.cleaned_data['parent_revision'] - parent = doc.at_revision(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({ @@ -223,22 +150,30 @@ def text(request, slug): try: revision = int(revision) - except ValueError: - revision = None + except (ValueError, TypeError): + revision = doc.revision() + + if revision is not None: + text = doc.at_revision(revision).materialize() + else: + text = '' return JSONResponse({ - 'text': doc.at_revision(revision).materialize(), + 'text': text, 'meta': {}, - 'revision': revision if revision else doc.revision(), + 'revision': revision, }) @never_cache @require_POST -def revert(request, slug): - form = DocumentTextRevertForm(request.POST, prefix="textrevert") +def revert(request, chunk_id): + form = forms.DocumentTextRevertForm(request.POST, prefix="textrevert") if form.is_valid(): - doc = get_object_or_404(Book, slug=slug).doc + doc = get_object_or_404(Chunk, pk=chunk_id) + if not doc.book.accessible(request): + return HttpResponseForbidden("Not authorized.") + revision = form.cleaned_data['revision'] comment = form.cleaned_data['comment'] @@ -250,7 +185,7 @@ def revert(request, slug): author = None before = doc.revision() - logger.info("Reverting %s to %s", slug, revision) + logger.info("Reverting %s to %s", chunk_id, revision) doc.at_revision(revision).revert(author=author, description=comment) return JSONResponse({ @@ -267,22 +202,26 @@ 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') 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") @@ -290,7 +229,7 @@ def gallery(request, directory): @never_cache -def diff(request, slug): +def diff(request, chunk_id): revA = int(request.GET.get('from', 0)) revB = int(request.GET.get('to', 0)) @@ -300,8 +239,15 @@ def diff(request, slug): if revB == 0: revB = None - doc = get_object_or_404(Book, slug=slug).doc - docA = doc.at_revision(revA).materialize() + doc = get_object_or_404(Chunk, pk=chunk_id) + if not doc.book.accessible(request): + return HttpResponseForbidden("Not authorized.") + + # allow diff from the beginning + if revA: + docA = doc.at_revision(revA).materialize() + else: + docA = "" docB = doc.at_revision(revB).materialize() return http.HttpResponse(nice_diff.html_diff_table(docA.splitlines(), @@ -309,74 +255,57 @@ def diff(request, slug): @never_cache -def revision(request, slug): - book = get_object_or_404(Book, slug=slug) - return http.HttpResponse(str(book.doc.revision())) +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())) @never_cache -def history(request, slug): +def history(request, chunk_id): # TODO: pagination - book = get_object_or_404(Book, slug=slug) - rev = book.doc.revision() + doc = get_object_or_404(Chunk, pk=chunk_id) + if not doc.book.accessible(request): + return HttpResponseForbidden("Not authorized.") + changes = [] - for change in book.doc.history().order_by('-created_at'): - if change.author: - author = "%s %s <%s>" % ( - change.author.first_name, - change.author.last_name, - change.author.email) - else: - author = None + for change in doc.history().reverse(): changes.append({ - "version": rev, + "version": change.revision, "description": change.description, - "author": author, - "date": change.created_at, - "tag": [], + "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 "", }) - rev -= 1 return JSONResponse(changes) - -""" -import wlapi - - @require_POST -@ajax_require_permission('wiki.can_change_tags') -def add_tag(request, name): - name = normalize_name(name) - storage = getstorage() - - form = DocumentTagForm(request.POST, prefix="addtag") +@ajax_require_permission('catalogue.can_pubmark') +def pubmark(request, chunk_id): + form = forms.DocumentPubmarkForm(request.POST, prefix="pubmark") if form.is_valid(): - doc = storage.get_or_404(form.cleaned_data['id']) - doc.add_tag(tag=form.cleaned_data['tag'], - revision=form.cleaned_data['revision'], - author=request.user.username) - return JSONResponse({"message": _("Tag added")}) + 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) -@require_POST -@ajax_require_permission('wiki.can_publish') -def publish(request, name): - name = normalize_name(name) - - storage = getstorage() - document = storage.get_by_tag(name, "ready_to_publish") - - api = wlapi.WLAPI(**settings.WL_API_CONFIG) - - try: - return JSONResponse({"result": api.publish_book(document)}) - except wlapi.APICallException, e: - return JSONServerError({"message": str(e)}) -""" - def themes(request): prefix = request.GET.get('q', '') return http.HttpResponse('\n'.join([str(t) for t in Theme.objects.filter(name__istartswith=prefix)]))