X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/af0693ddb5e4f6240d273c8a66fd1e6ef2a52872..9249e6ddc35e7cc7077fa5035fbc27397fbb70a9:/apps/wiki/views.py diff --git a/apps/wiki/views.py b/apps/wiki/views.py index 378701c2..7bff1a05 100644 --- a/apps/wiki/views.py +++ b/apps/wiki/views.py @@ -7,17 +7,21 @@ from lxml import etree from django.conf import settings +from django.contrib.auth.models import User +from django.contrib.auth.decorators import login_required +from django.db.models import Count 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) + ajax_require_permission, recursive_groupby, active_tab) +from wiki import helpers from django import http from django.shortcuts import get_object_or_404, redirect from django.http import Http404 from wiki.models import Book, Chunk, Theme -from wiki.forms import DocumentTextSaveForm, DocumentTextRevertForm, DocumentTagForm, DocumentCreateForm, DocumentsUploadForm +from wiki import forms from datetime import datetime from django.utils.encoding import smart_unicode from django.utils.translation import ugettext_lazy as _ @@ -26,6 +30,8 @@ from django.middleware.gzip import GZipMiddleware import librarian.html import librarian.text +from wiki import xml_tools +from apiclient import api_call # # Quick hack around caching problems, TODO: use ETags @@ -38,15 +44,72 @@ import operator MAX_LAST_DOCS = 10 +@active_tab('all') @never_cache def document_list(request): return direct_to_template(request, 'wiki/document_list.html', extra_context={ - 'books': Book.objects.all(), + 'books': [helpers.BookChunks(b) for b in Book.objects.all()], 'last_books': sorted(request.session.get("wiki_last_books", {}).items(), key=lambda x: x[1]['time'], reverse=True), }) +@active_tab('unassigned') +@never_cache +def unassigned(request): + chunks = Chunk.objects.filter(user=None).order_by('book__title', 'book', 'number') + books = [] + book = None + for chunk in chunks: + if chunk.book != book: + book = chunk.book + books.append(helpers.ChoiceChunks(book, [chunk])) + else: + books[-1].chunks.append(chunk) + + return direct_to_template(request, 'wiki/document_list.html', extra_context={ + 'books': books, + 'last_books': sorted(request.session.get("wiki_last_books", {}).items(), + key=lambda x: x[1]['time'], reverse=True), + }) + + +@never_cache +def user(request, username=None): + if username is None: + if request.user.is_authenticated(): + user = request.user + else: + raise Http404 + else: + user = get_object_or_404(User, username=username) + + chunks = Chunk.objects.filter(user=user).order_by('book__title', 'number') + books = [] + book = None + for chunk in chunks: + if chunk.book != book: + book = chunk.book + books.append(helpers.ChoiceChunks(book, [chunk])) + else: + books[-1].chunks.append(chunk) + + return direct_to_template(request, 'wiki/document_list.html', extra_context={ + 'books': books, + 'last_books': sorted(request.session.get("wiki_last_books", {}).items(), + key=lambda x: x[1]['time'], reverse=True), + }) +my = login_required(active_tab('my')(user)) + + +@active_tab('users') +def users(request): + return direct_to_template(request, 'wiki/user_list.html', extra_context={ + 'users': User.objects.all().annotate(count=Count('document')).order_by( + '-count', 'last_name', 'first_name'), + }) + + @never_cache def editor(request, slug, chunk=None, template_name='wiki/document_details.html'): try: @@ -78,9 +141,10 @@ def editor(request, slug, chunk=None, template_name='wiki/document_details.html' return direct_to_template(request, template_name, extra_context={ 'chunk': chunk, 'forms': { - "text_save": DocumentTextSaveForm(prefix="textsave"), - "text_revert": DocumentTextRevertForm(prefix="textrevert"), - "add_tag": DocumentTagForm(prefix="addtag"), + "text_save": forms.DocumentTextSaveForm(prefix="textsave"), + "text_revert": forms.DocumentTextRevertForm(prefix="textrevert"), + "add_tag": forms.DocumentTagForm(prefix="addtag"), + "pubmark": forms.DocumentPubmarkForm(prefix="pubmark"), }, 'REDMINE_URL': settings.REDMINE_URL, }) @@ -114,11 +178,14 @@ def editor_readonly(request, slug, chunk=None, template_name='wiki/document_deta }) -def create_missing(request, slug): +@active_tab('create') +def create_missing(request, slug=None): + if slug is None: + slug = '' slug = slug.replace(' ', '-') if request.method == "POST": - form = DocumentCreateForm(request.POST, request.FILES) + form = forms.DocumentCreateForm(request.POST, request.FILES) if form.is_valid(): if request.user.is_authenticated(): @@ -133,7 +200,7 @@ def create_missing(request, slug): return http.HttpResponseRedirect(reverse("wiki_editor", args=[book.slug])) else: - form = DocumentCreateForm(initial={ + form = forms.DocumentCreateForm(initial={ "slug": slug, "title": slug.replace('-', ' ').title(), }) @@ -144,9 +211,10 @@ def create_missing(request, slug): }) +@active_tab('upload') def upload(request): if request.method == "POST": - form = DocumentsUploadForm(request.POST, request.FILES) + form = forms.DocumentsUploadForm(request.POST, request.FILES) if form.is_valid(): import slughifi @@ -195,7 +263,7 @@ def upload(request): "error_list": error_list, }) else: - form = DocumentsUploadForm() + form = forms.DocumentsUploadForm() return direct_to_template(request, "wiki/document_upload.html", extra_context={ "form": form, @@ -206,16 +274,13 @@ def upload(request): @decorator_from_middleware(GZipMiddleware) def text(request, slug, chunk=None): try: - doc = Chunk.get(slug, chunk).doc + doc = Chunk.get(slug, chunk) except (Chunk.MultipleObjectsReturned, Chunk.DoesNotExist): raise Http404 if request.method == 'POST': - form = DocumentTextSaveForm(request.POST, prefix="textsave") + form = forms.DocumentTextSaveForm(request.POST, prefix="textsave") if form.is_valid(): - # TODO: - # - stage completion should be stored (as a relation) - if request.user.is_authenticated(): author = request.user else: @@ -223,10 +288,13 @@ def text(request, slug, chunk=None): text = form.cleaned_data['text'] parent_revision = form.cleaned_data['parent_revision'] parent = doc.at_revision(parent_revision) + stage = form.cleaned_data['stage_completed'] + tags = [stage] if stage else [] doc.commit(author=author, text=text, parent=parent, description=form.cleaned_data['comment'], + tags=tags, ) revision = doc.revision() return JSONResponse({ @@ -254,7 +322,7 @@ def text(request, slug, chunk=None): @never_cache def book_xml(request, slug): xml = get_object_or_404(Book, slug=slug).materialize() - + response = http.HttpResponse(xml, content_type='application/xml', mimetype='application/wl+xml') response['Content-Disposition'] = 'attachment; filename=%s.xml' % slug return response @@ -287,10 +355,10 @@ def book_html(request, slug): @never_cache @require_POST def revert(request, slug, chunk=None): - form = DocumentTextRevertForm(request.POST, prefix="textrevert") + form = forms.DocumentTextRevertForm(request.POST, prefix="textrevert") if form.is_valid(): try: - doc = Chunk.get(slug, chunk).doc + doc = Chunk.get(slug, chunk) except (Chunk.MultipleObjectsReturned, Chunk.DoesNotExist): raise Http404 @@ -356,7 +424,7 @@ def diff(request, slug, chunk=None): revB = None try: - doc = Chunk.get(slug, chunk).doc + doc = Chunk.get(slug, chunk) except (Chunk.MultipleObjectsReturned, Chunk.DoesNotExist): raise Http404 docA = doc.at_revision(revA).materialize() @@ -369,7 +437,7 @@ def diff(request, slug, chunk=None): @never_cache def revision(request, slug, chunk=None): try: - doc = Chunk.get(slug, chunk).doc + doc = Chunk.get(slug, chunk) except (Chunk.MultipleObjectsReturned, Chunk.DoesNotExist): raise Http404 return http.HttpResponse(str(doc.revision())) @@ -379,25 +447,19 @@ def revision(request, slug, chunk=None): def history(request, slug, chunk=None): # TODO: pagination try: - doc = Chunk.get(slug, chunk).doc + doc = Chunk.get(slug, chunk) except (Chunk.MultipleObjectsReturned, Chunk.DoesNotExist): raise Http404 changes = [] for change in 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 changes.append({ "version": change.revision, "description": change.description, - "author": author, + "author": change.author_str(), "date": change.created_at, - "tag": [], + "publishable": "Publishable\n" if change.publishable else "", + "tag": ',\n'.join(unicode(tag) for tag in change.tags.all()), }) return JSONResponse(changes) @@ -405,48 +467,232 @@ def history(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 = len(book) + 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' + 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() + else: + form = None + return direct_to_template(request, "wiki/book_detail.html", extra_context={ "book": book, + "chunks": chunks, + "need_fixing": need_fixing, + "choose_master": choose_master, + "first_master": first_master, + "form": form, + }) + + +def chunk_add(request, slug, chunk): + try: + doc = Chunk.get(slug, chunk) + except (Chunk.MultipleObjectsReturned, Chunk.DoesNotExist): + raise Http404 + + if request.method == "POST": + form = forms.ChunkAddForm(request.POST, instance=doc) + if form.is_valid(): + if request.user.is_authenticated(): + creator = request.user + else: + creator = None + doc.split(creator=creator, + slug=form.cleaned_data['slug'], + comment=form.cleaned_data['comment'], + ) + + return http.HttpResponseRedirect(doc.book.get_absolute_url()) + else: + form = forms.ChunkAddForm(initial={ + "slug": str(doc.number + 1), + "comment": "cz. %d" % (doc.number + 1, ), + }) + + return direct_to_template(request, "wiki/chunk_add.html", extra_context={ + "chunk": doc, + "form": form, + }) + + +def chunk_edit(request, slug, chunk): + try: + doc = Chunk.get(slug, chunk) + except (Chunk.MultipleObjectsReturned, Chunk.DoesNotExist): + raise Http404 + if request.method == "POST": + form = forms.ChunkForm(request.POST, instance=doc) + if form.is_valid(): + form.save() + return http.HttpResponseRedirect(doc.book.get_absolute_url()) + else: + form = forms.ChunkForm(instance=doc) + return direct_to_template(request, "wiki/chunk_edit.html", extra_context={ + "chunk": doc, + "form": form, }) +def book_append(request, slug): + book = get_object_or_404(Book, slug=slug) + if request.method == "POST": + form = forms.BookAppendForm(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() + return direct_to_template(request, "wiki/book_append_to.html", extra_context={ + "book": book, + "form": form, + }) + -""" -import wlapi +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, "wiki/book_edit.html", extra_context={ + "book": book, + "form": form, + }) @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") +def add_tag(request, slug, chunk=None): + form = forms.DocumentTagForm(request.POST, prefix="addtag") 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) + try: + doc = Chunk.get(slug, chunk) + except (Chunk.MultipleObjectsReturned, Chunk.DoesNotExist): + raise Http404 + + tag = form.cleaned_data['tag'] + revision = form.cleaned_data['revision'] + doc.at_revision(revision).tags.add(tag) return JSONResponse({"message": _("Tag added")}) else: return JSONFormInvalid(form) @require_POST -@ajax_require_permission('wiki.can_publish') -def publish(request, name): - name = normalize_name(name) +@ajax_require_permission('wiki.can_pubmark') +def pubmark(request, slug, chunk=None): + form = forms.DocumentPubmarkForm(request.POST, prefix="pubmark") + if form.is_valid(): + try: + doc = Chunk.get(slug, chunk) + except (Chunk.MultipleObjectsReturned, Chunk.DoesNotExist): + raise Http404 - storage = getstorage() - document = storage.get_by_tag(name, "ready_to_publish") + revision = form.cleaned_data['revision'] + publishable = form.cleaned_data['publishable'] + change = doc.at_revision(revision) + print publishable, change.publishable + if publishable != change.publishable: + change.publishable = publishable + change.save() + return JSONResponse({"message": _("Revision marked")}) + else: + return JSONResponse({"message": _("Nothing changed")}) + else: + return JSONFormInvalid(form) - api = wlapi.WLAPI(**settings.WL_API_CONFIG) +@require_POST +@login_required +def publish(request, slug): + book = get_object_or_404(Book, slug=slug) try: - return JSONResponse({"result": api.publish_book(document)}) - except wlapi.APICallException, e: - return JSONServerError({"message": str(e)}) -""" + ret = api_call(request.user, "books", {"book_xml": book.materialize()}) + except BaseException, e: + return http.HttpResponse(e) + else: + book.last_published = datetime.now() + book.save() + return http.HttpResponseRedirect(book.get_absolute_url()) + def themes(request): prefix = request.GET.get('q', '')