X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/1b718c10066557540770bb0960a773dce0ad4462..4d106a6318aa0c508a93acb9e2a6fb146ed177ba:/apps/catalogue/views.py?ds=sidebyside diff --git a/apps/catalogue/views.py b/apps/catalogue/views.py index 487307d5..6fb5f60b 100644 --- a/apps/catalogue/views.py +++ b/apps/catalogue/views.py @@ -2,15 +2,18 @@ from datetime import datetime import logging import os from StringIO import StringIO +from urllib import unquote +from urlparse import urlsplit, urlunsplit from django.contrib import auth from django.contrib.auth.models import User -from django.contrib.auth.decorators import login_required +from django.contrib.auth.decorators import login_required, permission_required from django.core.urlresolvers import reverse from django.db.models import Count, Q from django import http from django.http import Http404 from django.shortcuts import get_object_or_404, render +from django.utils.encoding import iri_to_uri from django.utils.http import urlquote_plus from django.utils.translation import ugettext_lazy as _ from django.views.decorators.http import require_POST @@ -24,6 +27,7 @@ from catalogue import forms from catalogue import helpers from catalogue.helpers import active_tab from catalogue.models import Book, Chunk, BookPublishRecord, ChunkPublishRecord +from catalogue.tasks import publishable_error from catalogue import xml_tools # @@ -53,6 +57,8 @@ def my(request): return render(request, 'catalogue/my_page.html', { 'last_books': sorted(request.session.get("wiki_last_books", {}).items(), key=lambda x: x[1]['time'], reverse=True), + + "logout_to": '/', }) @@ -75,6 +81,7 @@ def logout_then_redirect(request): return http.HttpResponseRedirect(urlquote_plus(request.GET.get('next', '/'), safe='/?=')) +@permission_required('catalogue.add_book') @active_tab('create') def create_missing(request, slug=None): if slug is None: @@ -106,9 +113,12 @@ def create_missing(request, slug=None): return direct_to_template(request, "catalogue/document_create_missing.html", extra_context={ "slug": slug, "form": form, + + "logout_to": '/', }) +@permission_required('catalogue.add_book') @active_tab('upload') def upload(request): if request.method == "POST": @@ -160,12 +170,16 @@ def upload(request): "ok_list": ok_list, "skipped_list": skipped_list, "error_list": error_list, + + "logout_to": '/', }) else: form = forms.DocumentsUploadForm() return direct_to_template(request, "catalogue/document_upload.html", extra_context={ "form": form, + + "logout_to": '/', }) @@ -214,108 +228,33 @@ def revision(request, slug, chunk=None): def book(request, slug): book = get_object_or_404(Book, slug=slug) - # TODO: most of this should go somewhere else - - # do we need some automation? - first_master = None - chunks = [] - need_fixing = False - choose_master = False - - length = book.chunk_set.count() - for i, chunk in enumerate(book): - chunk_dict = { - "chunk": chunk, - "fix": [], - "grade": "" - } - graded = xml_tools.GradedText(chunk.materialize()) - if graded.is_wl(): - master = graded.master() - if first_master is None: - first_master = master - elif master != first_master: - chunk_dict['fix'].append('bad-master') - - if i > 0 and not graded.has_trim_begin(): - chunk_dict['fix'].append('trim-begin') - if i < length - 1 and not graded.has_trim_end(): - chunk_dict['fix'].append('trim-end') - - if chunk_dict['fix']: - chunk_dict['grade'] = 'wl-fix' - else: - chunk_dict['grade'] = 'wl' - - elif graded.is_broken_wl(): - chunk_dict['grade'] = 'wl-broken' - elif graded.is_xml(): - chunk_dict['grade'] = 'xml' + if request.user.has_perm('catalogue.change_book'): + if request.method == "POST": + form = forms.BookForm(request.POST, instance=book) + if form.is_valid(): + form.save() + return http.HttpResponseRedirect(book.get_absolute_url()) else: - chunk_dict['grade'] = 'plain' - chunk_dict['fix'].append('wl') - choose_master = True - - if chunk_dict['fix']: - need_fixing = True - chunks.append(chunk_dict) - - if first_master or not need_fixing: - choose_master = False - - if request.method == "POST": - form = forms.ChooseMasterForm(request.POST) - if not choose_master or form.is_valid(): - if choose_master: - first_master = form.cleaned_data['master'] - - # do the actual fixing - for c in chunks: - if not c['fix']: - continue - - text = c['chunk'].materialize() - for fix in c['fix']: - if fix == 'bad-master': - text = xml_tools.change_master(text, first_master) - elif fix == 'trim-begin': - text = xml_tools.add_trim_begin(text) - elif fix == 'trim-end': - text = xml_tools.add_trim_end(text) - elif fix == 'wl': - text = xml_tools.basic_structure(text, first_master) - author = request.user if request.user.is_authenticated() else None - description = "auto-fix: " + ", ".join(c['fix']) - c['chunk'].commit(text=text, author=author, - description=description) - - return http.HttpResponseRedirect(book.get_absolute_url()) - elif choose_master: - form = forms.ChooseMasterForm() + form = forms.BookForm(instance=book) + editable = True else: - form = None + form = forms.ReadonlyBookForm(instance=book) + editable = False - try: - book.assert_publishable() - except AssertionError, e: - publishable = False - publishable_error = e - else: - publishable = True - publishable_error = None + task = publishable_error.delay(book) + publish_error = task.wait() + publishable = publish_error is None return direct_to_template(request, "catalogue/book_detail.html", extra_context={ "book": book, "publishable": publishable, - "publishable_error": publishable_error, - "chunks": chunks, - "need_fixing": need_fixing, - "choose_master": choose_master, - "first_master": first_master, + "publishable_error": publish_error, "form": form, + "editable": editable, }) +@permission_required('catalogue.add_chunk') def chunk_add(request, slug, chunk): try: doc = Chunk.get(slug, chunk) @@ -356,43 +295,42 @@ def chunk_edit(request, slug, chunk): form = forms.ChunkForm(request.POST, instance=doc) if form.is_valid(): form.save() - return http.HttpResponseRedirect(doc.book.get_absolute_url()) + go_next = request.GET.get('next', None) + if go_next: + go_next = urlquote_plus(unquote(iri_to_uri(go_next)), safe='/?=&') + else: + go_next = doc.book.get_absolute_url() + return http.HttpResponseRedirect(go_next) else: form = forms.ChunkForm(instance=doc) + + parts = urlsplit(request.META['HTTP_REFERER']) + parts = ['', ''] + list(parts[2:]) + go_next = urlquote_plus(urlunsplit(parts)) + return direct_to_template(request, "catalogue/chunk_edit.html", extra_context={ "chunk": doc, "form": form, + "go_next": go_next, }) +@permission_required('catalogue.change_book') def book_append(request, slug): book = get_object_or_404(Book, slug=slug) if request.method == "POST": - form = forms.BookAppendForm(request.POST) + form = forms.BookAppendForm(book, request.POST) if form.is_valid(): append_to = form.cleaned_data['append_to'] append_to.append(book) return http.HttpResponseRedirect(append_to.get_absolute_url()) else: - form = forms.BookAppendForm() + form = forms.BookAppendForm(book) return direct_to_template(request, "catalogue/book_append_to.html", extra_context={ "book": book, "form": form, - }) - -def book_edit(request, slug): - book = get_object_or_404(Book, slug=slug) - if request.method == "POST": - form = forms.BookForm(request.POST, instance=book) - if form.is_valid(): - form.save() - return http.HttpResponseRedirect(book.get_absolute_url()) - else: - form = forms.BookForm(instance=book) - return direct_to_template(request, "catalogue/book_edit.html", extra_context={ - "book": book, - "form": form, + "logout_to": '/', })