+# -*- coding: utf-8 -*-
+#
+# This file is part of MIL/PEER, licensed under GNU Affero GPLv3 or later.
+# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
+#
+import json
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 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.html import escape
+from django.utils.translation import ugettext as _
+from django.views.decorators.http import require_POST
+from django.shortcuts import get_object_or_404, render
+
+from catalogue.models import Document, Template
+from dvcs.models import Revision
+import nice_diff
+from wiki import forms
+from wiki.helpers import JSONResponse, JSONFormInvalid
#
# 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),
- })
+def get_history(document):
+ revisions = []
+ for i, revision in enumerate(document.history()):
+ revisions.append({
+ "version": i + 1,
+ "description": revision.description,
+ "author": escape(revision.author_str()),
+ "date": localize(revision.created_at),
+ "revision": revision.pk,
+ "published": _("Published") + ": " +
+ localize(revision.publish_log.order_by('-timestamp')[0].timestamp)
+ if revision.publish_log.exists() else "",
+ })
+ return revisions
@never_cache
-def editor(request, slug, 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]))
-
- access_time = datetime.now()
- last_books = request.session.get("wiki_last_books", {})
- last_books[slug] = {
- 'time': access_time,
- 'title': book.title,
- }
-
- if len(last_books) > MAX_LAST_DOCS:
- oldest_key = min(last_books, key=operator.itemgetter('time'))
- del last_books[oldest_key]
- request.session['wiki_last_books'] = last_books
-
- return direct_to_template(request, template_name, extra_context={
- 'book': book,
+def editor(request, pk, template_name='wiki/bootstrap.html'):
+ doc = get_object_or_404(Document, pk=pk, deleted=False)
+
+ save_form = forms.DocumentTextSaveForm(user=request.user, prefix="textsave")
+ text = doc.materialize()
+ revision = doc.revision
+ history = get_history(doc)
+ return render(request, template_name, {
+ 'serialized_document_data': json.dumps({
+ 'document': text,
+ 'document_id': doc.pk,
+ 'title': doc.meta().get('title', ''),
+ 'history': history,
+ 'version': len(history),
+ 'revision': revision.pk,
+ 'stage': doc.stage,
+ 'assignment': str(doc.assigned_to),
+ }),
+ 'serialized_templates': json.dumps([
+ {'id': t.id, 'name': t.name, 'content': t.content} for t in Template.objects.filter(is_partial=True)
+ ]),
'forms': {
- "text_save": DocumentTextSaveForm(prefix="textsave"),
- "text_revert": DocumentTextRevertForm(prefix="textrevert"),
- "add_tag": DocumentTagForm(prefix="addtag"),
+ "text_save": save_form,
+ "text_revert": forms.DocumentTextRevertForm(prefix="textrevert"),
+ "text_publish": forms.DocumentTextPublishForm(prefix="textpublish"),
},
- 'REDMINE_URL': settings.REDMINE_URL,
- })
-
-
-@require_GET
-def editor_readonly(request, slug, template_name='wiki/document_details_readonly.html'):
- try:
- book = Book.objects.get(slug=slug)
- revision = request.GET['revision']
- except KeyError:
- raise http.Http404
-
- access_time = datetime.now()
- last_books = request.session.get("wiki_last_books", {})
- last_books[slug] = {
- 'time': access_time,
- 'title': book.title,
- }
-
- if len(last_books) > MAX_LAST_DOCS:
- oldest_key = min(last_books, key=operator.itemgetter('time'))
- del last_books[oldest_key]
- request.session['wiki_last_books'] = last_books
-
- return direct_to_template(request, template_name, extra_context={
- 'book': book,
- '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,
+ 'pk': doc.pk,
})
@never_cache
@decorator_from_middleware(GZipMiddleware)
-def text(request, slug):
- doc = get_object_or_404(Book, slug=slug).doc
+def text(request, doc_id):
+ doc = get_object_or_404(Document, pk=doc_id, deleted=False)
+ # 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)
- doc.commit(author=author,
- text=text,
- parent=parent,
- description=form.cleaned_data['comment'],
- )
- revision = doc.revision()
+ # parent_revision = form.cleaned_data['parent_revision']
+ # if parent_revision is not None:
+ # parent = doc.at_revision(parent_revision)
+ # else:
+ # parent = None
+ stage = form.cleaned_data['stage']
+ # tags = [stage] if stage else []
+ # publishable = (form.cleaned_data['publishable'] and
+ # request.user.has_perm('catalogue.can_pubmark'))
+ try:
+ doc.commit(
+ author=author,
+ text=text,
+ description=form.cleaned_data['comment'],
+ author_name=form.cleaned_data['author_name'],
+ author_email=form.cleaned_data['author_email'],
+ )
+ doc.set_stage(stage)
+ except:
+ from traceback import print_exc
+ print_exc()
+ raise
+ # revision = doc.revision()
return JSONResponse({
- 'text': doc.materialize() if parent_revision != revision else None,
- 'meta': {},
- 'revision': revision,
+ 'text': None, # doc.materialize() if parent_revision != revision else None,
+ # 'version': revision,
+ # 'stage': doc.stage.name if doc.stage else None,
+ 'assignment': doc.assigned_to.username if doc.assigned_to else None
})
else:
return JSONFormInvalid(form)
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, doc_id):
+ form = forms.DocumentTextRevertForm(request.POST, prefix="textrevert")
if form.is_valid():
- doc = get_object_or_404(Book, slug=slug).doc
- revision = form.cleaned_data['revision']
+ doc = get_object_or_404(Document, pk=doc_id, deleted=False)
+ rev = get_object_or_404(Revision, pk=form.cleaned_data['revision'])
comment = form.cleaned_data['comment']
- comment += "\n#revert to %s" % revision
+ comment += "\n#revert to %s" % rev.pk
if request.user.is_authenticated():
author = request.user
else:
author = None
- before = doc.revision()
- logger.info("Reverting %s to %s", slug, revision)
- doc.at_revision(revision).revert(author=author, description=comment)
+ # before = doc.revision
+ logger.info("Reverting %s to %s", doc_id, rev.pk)
+
+ doc.commit(
+ author=author,
+ text=rev.materialize(),
+ description=comment,
+ # author_name=form.cleaned_data['author_name'], #?
+ # author_email=form.cleaned_data['author_email'], #?
+ )
return JSONResponse({
- 'text': doc.materialize() if before != doc.revision() else None,
- 'meta': {},
- 'revision': doc.revision(),
+ # 'document': None, #doc.materialize() if before != doc.revision else None,
+ # 'version': doc.revision(),
})
else:
return JSONFormInvalid(form)
@never_cache
def gallery(request, directory):
+ if not request.user.is_authenticated():
+ return HttpResponseForbidden("Not authorized.")
+
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()
+
return JSONResponse(images)
except (IndexError, OSError):
logger.exception("Unable to fetch gallery")
@never_cache
-def diff(request, slug):
+def diff(request, doc_id):
revA = int(request.GET.get('from', 0))
revB = int(request.GET.get('to', 0))
if revB == 0:
revB = None
- doc = get_object_or_404(Book, slug=slug).doc
- docA = doc.at_revision(revA).materialize()
- docB = doc.at_revision(revB).materialize()
+ # TODO: check if revisions in line.
- return http.HttpResponse(nice_diff.html_diff_table(docA.splitlines(),
- docB.splitlines(), context=3))
+ doc = get_object_or_404(Document, pk=doc_id, deleted=False)
+ # allow diff from the beginning
+ if revA:
+ docA = Revision.objects.get(pk=revA).materialize()
+ else:
+ docA = ""
+ docB = Revision.objects.get(pk=revB).materialize()
-@never_cache
-def revision(request, slug):
- book = get_object_or_404(Book, slug=slug)
- return http.HttpResponse(str(book.doc.revision()))
+ return http.HttpResponse(nice_diff.html_diff_table(docA.splitlines(), docB.splitlines(), context=3))
@never_cache
-def history(request, slug):
+def history(request, doc_id):
# TODO: pagination
- book = get_object_or_404(Book, slug=slug)
- rev = book.doc.revision()
- 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
- changes.append({
- "version": rev,
- "description": change.description,
- "author": author,
- "date": change.created_at,
- "tag": [],
- })
- 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")
- 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")})
- else:
- return JSONFormInvalid(form)
+ doc = get_object_or_404(Document, pk=doc_id, deleted=False)
-
-@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)]))
+ return JSONResponse(get_history(doc))
fnp / redakcja.git / blobdiff