fix when there is no gallery dir

[redakcja.git] / apps / wiki / views.py

diff --git a/apps/wiki/views.py b/apps/wiki/views.py
index 146db69..05b9031 100644 (file)
--- a/apps/wiki/views.py
+++ b/apps/wiki/views.py
@@ -1,89 +1,121 @@
+# -*- coding: utf-8 -*-
+from datetime import datetime

 import os
 import os

-from StringIO import StringIO

 import logging
 import logging

-logger = logging.getLogger("fnp.wiki")
-
-from lxml import etree
+import urllib
+import json

 
 from django.conf import settings
 
 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 django.core.urlresolvers import reverse

-from wiki.helpers import (JSONResponse, JSONFormInvalid, JSONServerError,
-                ajax_require_permission, recursive_groupby)

 from django import http
 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 import forms
-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.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

 
 

-import librarian.html
-import librarian.text
-from wiki.xml_tools import GradedText
+from catalogue.models import Book, Chunk, Template
+import nice_diff
+from wiki import forms
+from wiki.helpers import JSONResponse, JSONFormInvalid, ajax_require_permission
+from wiki.models import Theme

 
 #
 # Quick hack around caching problems, TODO: use ETags
 #
 from django.views.decorators.cache import never_cache
 
 
 #
 # 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
 
 
 
 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(chunk):
+    changes = []
+    for change in chunk.history():
+        changes.append({
+                "version": change.revision,
+                "description": change.description,
+                "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 ""),
+            })
+    return changes

 
 
 @never_cache
 
 
 @never_cache

-def editor(request, slug, chunk=None, template_name='wiki/document_details.html'):
+def editor(request, slug, chunk=None, template_name='wiki/bootstrap.html'):

     try:
         chunk = Chunk.get(slug, chunk)
     except Chunk.MultipleObjectsReturned:
     try:
         chunk = Chunk.get(slug, chunk)
     except Chunk.MultipleObjectsReturned:

-        # TODO: choice page

         raise Http404
     except Chunk.DoesNotExist:
         if chunk is None:
             try:
         raise Http404
     except Chunk.DoesNotExist:
         if chunk is None:
             try:

-                book = Book.objects.get(slug=slug)
+                Book.objects.get(slug=slug)

             except Book.DoesNotExist:
             except Book.DoesNotExist:

-                return http.HttpResponseRedirect(reverse("wiki_create_missing", args=[slug]))
+                return http.HttpResponseRedirect(reverse("catalogue_create_missing", args=[slug]))
+            else:
+                raise Http404

         else:
             raise Http404
         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, chunk.slug] = {
         'time': access_time,
         'title': chunk.pretty_name(),
 
     access_time = datetime.now()
     last_books = request.session.get("wiki_last_books", {})
     last_books[slug, chunk.slug] = {
         'time': access_time,
         'title': chunk.pretty_name(),

-        }
+    }

 
     if len(last_books) > MAX_LAST_DOCS:
         oldest_key = min(last_books, key=lambda x: last_books[x]['time'])
         del last_books[oldest_key]
     request.session['wiki_last_books'] = last_books
 
 
     if len(last_books) > MAX_LAST_DOCS:
         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={
-        'chunk': chunk,
+    save_form = forms.DocumentTextSaveForm(user=request.user, chunk=chunk, prefix="textsave")
+    try:
+        version = int(request.GET.get('version', ''))
+    except ValueError:
+        version = None
+    if version:
+        text = chunk.at_revision(version).materialize()
+    else:
+        text = chunk.materialize()
+    gallery_dir = os.path.join(settings.MEDIA_ROOT, settings.IMAGE_DIR, chunk.book.gallery)
+    materials = set(os.listdir(gallery_dir)) if os.path.isdir(gallery_dir) else []
+    materials.update([n.rsplit('.', 1)[0] for n in materials])
+    return render(request, template_name, {
+        'serialized_document_data': json.dumps({
+            'document': text,
+            'document_id': chunk.id,
+            'title': chunk.book.title,
+            'history': get_history(chunk),
+            'version': version or chunk.revision(),
+            'stage': chunk.stage.name if chunk.stage else None,
+            'assignment': chunk.user.username if chunk.user else None
+        }),
+        'serialized_templates': json.dumps([
+            {'id': t.id, 'name': t.name, 'content': t.content} for t in Template.objects.filter(is_partial=True)
+        ]),

         'forms': {
         'forms': {

-            "text_save": forms.DocumentTextSaveForm(prefix="textsave"),
-            "text_revert": forms.DocumentTextRevertForm(prefix="textrevert"),
-            "add_tag": forms.DocumentTagForm(prefix="addtag"),
+            "text_save": save_form,
+            "text_revert": forms.DocumentTextRevertForm(prefix="textrevert")

         },
         },

-        'REDMINE_URL': settings.REDMINE_URL,
+        'tags': list(save_form.fields['stage_completed'].choices),
+        'can_pubmark': request.user.has_perm('catalogue.can_pubmark'),
+        'slug': chunk.book.slug,
+        'gallery': chunk.book.gallery,
+        'materials': json.dumps(list(materials)),

     })
 
 
     })
 
 


@@ -94,6 +126,8 @@ def editor_readonly(request, slug, chunk=None, template_name='wiki/document_deta
         revision = request.GET['revision']
     except (Chunk.MultipleObjectsReturned, Chunk.DoesNotExist, KeyError):
         raise Http404
         revision = request.GET['revision']
     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", {})
 
     access_time = datetime.now()
     last_books = request.session.get("wiki_last_books", {})


@@ -107,7 +141,7 @@ def editor_readonly(request, slug, chunk=None, template_name='wiki/document_deta
         del last_books[oldest_key]
     request.session['wiki_last_books'] = last_books
 
         del last_books[oldest_key]
     request.session['wiki_last_books'] = last_books
 

-    return direct_to_template(request, template_name, extra_context={
+    return render(request, template_name, {

         'chunk': chunk,
         'revision': revision,
         'readonly': True,
         'chunk': chunk,
         'revision': revision,
         'readonly': True,


@@ -115,185 +149,55 @@ def editor_readonly(request, slug, chunk=None, template_name='wiki/document_deta
     })
 
 
     })
 
 

-def create_missing(request, slug):
-    slug = slug.replace(' ', '-')
-
-    if request.method == "POST":
-        form = forms.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 = forms.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 = forms.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 = forms.DocumentsUploadForm()
-
-    return direct_to_template(request, "wiki/document_upload.html", extra_context={
-        "form": form,
-    })
-
-

 @never_cache
 @decorator_from_middleware(GZipMiddleware)
 @never_cache
 @decorator_from_middleware(GZipMiddleware)

-def text(request, slug, chunk=None):
-    try:
-        doc = Chunk.get(slug, chunk)
-    except (Chunk.MultipleObjectsReturned, Chunk.DoesNotExist):
-        raise Http404
+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':
 
     if request.method == 'POST':

-        form = forms.DocumentTextSaveForm(request.POST, prefix="textsave")
+        form = forms.DocumentTextSaveForm(request.POST, user=request.user, chunk=doc, prefix="textsave")

         if form.is_valid():
         if form.is_valid():

-            if request.user.is_authenticated():
-                author = request.user
-            else:
-                author = None
-            text = form.cleaned_data['text']
+            form.save()

             parent_revision = form.cleaned_data['parent_revision']
             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({
                 'text': doc.materialize() if parent_revision != revision else None,
             revision = doc.revision()
             return JSONResponse({
                 'text': doc.materialize() if parent_revision != revision else None,

-                'meta': {},
-                'revision': revision,
+                'version': revision,
+                'stage': doc.stage.name if doc.stage else None,
+                'assignment': doc.user.username if doc.user else None

             })
         else:
             return JSONFormInvalid(form)
     else:
         revision = request.GET.get("revision", None)
             })
         else:
             return JSONFormInvalid(form)
     else:
         revision = request.GET.get("revision", None)

-        
+

         try:
             revision = int(revision)
         except (ValueError, TypeError):
         try:
             revision = int(revision)
         except (ValueError, TypeError):

-            revision = None
+            revision = doc.revision()
+
+        if revision is not None:
+            text = doc.at_revision(revision).materialize()
+        else:
+            text = ''

 
         return JSONResponse({
 
         return JSONResponse({

-            'text': doc.at_revision(revision).materialize(),
+            'text': text,

             'meta': {},
             'meta': {},

-            'revision': revision if revision else doc.revision(),
+            'revision': revision,

         })
 
 
         })
 
 

-@never_cache
-def book_xml(request, slug):
-    xml = get_object_or_404(Book, slug=slug).materialize(Book.publish_tag())
-
-    response = http.HttpResponse(xml, content_type='application/xml', mimetype='application/wl+xml')
-    response['Content-Disposition'] = 'attachment; filename=%s.xml' % slug
-    return response
-
-
-@never_cache
-def book_txt(request, slug):
-    xml = get_object_or_404(Book, slug=slug).materialize(Book.publish_tag())
-    output = StringIO()
-    # errors?
-    librarian.text.transform(StringIO(xml), output)
-    text = output.getvalue()
-    response = http.HttpResponse(text, content_type='text/plain', mimetype='text/plain')
-    response['Content-Disposition'] = 'attachment; filename=%s.txt' % slug
-    return response
-
-
-@never_cache
-def book_html(request, slug):
-    xml = get_object_or_404(Book, slug=slug).materialize(Book.publish_tag())
-    output = StringIO()
-    # errors?
-    librarian.html.transform(StringIO(xml), output, parse_dublincore=False,
-                             flags=['full-page'])
-    html = output.getvalue()
-    response = http.HttpResponse(html, content_type='text/html', mimetype='text/html')
-    return response
-
-

 @never_cache
 @require_POST
 @never_cache
 @require_POST

-def revert(request, slug, chunk=None):
+def revert(request, chunk_id):

     form = forms.DocumentTextRevertForm(request.POST, prefix="textrevert")
     if form.is_valid():
     form = forms.DocumentTextRevertForm(request.POST, prefix="textrevert")
     if form.is_valid():

-        try:
-            doc = Chunk.get(slug, chunk)
-        except (Chunk.MultipleObjectsReturned, Chunk.DoesNotExist):
-            raise Http404
+        doc = get_object_or_404(Chunk, pk=chunk_id)
+        if not doc.book.accessible(request):
+            return HttpResponseForbidden("Not authorized.")

 
         revision = form.cleaned_data['revision']
 
 
         revision = form.cleaned_data['revision']
 


@@ -306,13 +210,12 @@ def revert(request, slug, chunk=None):
             author = None
 
         before = doc.revision()
             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({
         doc.at_revision(revision).revert(author=author, description=comment)
 
         return JSONResponse({

-            'text': doc.materialize() if before != doc.revision() else None,
-            'meta': {},
-            'revision': doc.revision(),
+            'document': doc.materialize() if before != doc.revision() else None,
+            'version': doc.revision(),

         })
     else:
         return JSONFormInvalid(form)
         })
     else:
         return JSONFormInvalid(form)


@@ -323,22 +226,26 @@ def gallery(request, directory):
     try:
         base_url = ''.join((
                         smart_unicode(settings.MEDIA_URL),
     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(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):
                     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):
 
         def is_image(filename):

-            return os.path.splitext(f)[1].lower() in (u'.jpg', u'.jpeg', u'.png')
+            return os.path.splitext(filename)[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()
 
         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")
         return JSONResponse(images)
     except (IndexError, OSError):
         logger.exception("Unable to fetch gallery")


@@ -346,7 +253,7 @@ def gallery(request, directory):
 
 
 @never_cache
 
 
 @never_cache

-def diff(request, slug, chunk=None):
+def diff(request, chunk_id):

     revA = int(request.GET.get('from', 0))
     revB = int(request.GET.get('to', 0))
 
     revA = int(request.GET.get('from', 0))
     revB = int(request.GET.get('to', 0))
 


@@ -356,195 +263,59 @@ def diff(request, slug, chunk=None):
     if revB == 0:
         revB = None
 
     if revB == 0:
         revB = None
 

-    try:
-        doc = Chunk.get(slug, chunk)
-    except (Chunk.MultipleObjectsReturned, Chunk.DoesNotExist):
-        raise Http404
-    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()
 
     docB = doc.at_revision(revB).materialize()
 

-    return http.HttpResponse(nice_diff.html_diff_table(docA.splitlines(),
-                                         docB.splitlines(), context=3))
+    return http.HttpResponse(nice_diff.html_diff_table(docA.splitlines(), docB.splitlines(), context=3))

 
 
 @never_cache
 
 
 @never_cache

-def revision(request, slug, chunk=None):
-    try:
-        doc = Chunk.get(slug, chunk)
-    except (Chunk.MultipleObjectsReturned, Chunk.DoesNotExist):
-        raise Http404
+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
     return http.HttpResponse(str(doc.revision()))
 
 
 @never_cache

-def history(request, slug, chunk=None):
+def history(request, chunk_id):

     # TODO: pagination
     # TODO: pagination

-    try:
-        doc = Chunk.get(slug, chunk)
-    except (Chunk.MultipleObjectsReturned, Chunk.DoesNotExist):
-        raise Http404
-
-    changes = []
-    for change in doc.history().order_by('-created_at'):
-        changes.append({
-                "version": change.revision,
-                "description": change.description,
-                "author": change.author_str(),
-                "date": change.created_at,
-                "tag": ',\n'.join(unicode(tag) for tag in change.tags.all()),
-            })
-    return JSONResponse(changes)
-
-
-def book(request, slug):
-    book = get_object_or_404(Book, slug=slug)
-
-    # do we need some automation?
-    some_wl = False
-    first_master = None
-    chunks = []
-
-    for chunk in book:
-        graded = GradedText(chunk.materialize())
-        chunk_dict = {
-            "chunk": chunk,
-            "graded": graded,
-            }
-        if graded.is_wl():
-            some_wl = True
-            master = graded.master()
-            if first_master is None:
-                first_master = master
-            elif master != first_master:
-                chunk_dict['bad_master'] = master
-        chunks.append(chunk_dict)
-
-    return direct_to_template(request, "wiki/book_detail.html", extra_context={
-        "book": book,
-        "chunks": chunks,
-        "some_wl": some_wl,
-        "first_master": first_master,
-    })
-
-
-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,
-    })
+    doc = get_object_or_404(Chunk, pk=chunk_id)
+    if not doc.book.accessible(request):
+        return HttpResponseForbidden("Not authorized.")

 
 

-
-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,
-    })
-
-
-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,
-    })
+    return JSONResponse(get_history(doc))

 
 
 @require_POST
 
 
 @require_POST

-@ajax_require_permission('wiki.can_change_tags')
-def add_tag(request, slug, chunk=None):
-    form = forms.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():
     if form.is_valid():

-        try:
-            doc = Chunk.get(slug, chunk)
-        except (Chunk.MultipleObjectsReturned, Chunk.DoesNotExist):
-            raise Http404
+        doc = get_object_or_404(Chunk, pk=chunk_id)
+        if not doc.book.accessible(request):
+            return HttpResponseForbidden("Not authorized.")

 
 

-        tag = form.cleaned_data['tag']
-        revision = revision=form.cleaned_data['revision']
-        doc.at_revision(revision).tags.add(tag)
-        return JSONResponse({"message": _("Tag added")})
+        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)
 
 
     else:
         return JSONFormInvalid(form)
 
 

-"""
-import wlapi
-
-
-@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)]))
 def themes(request):
     prefix = request.GET.get('q', '')
     return http.HttpResponse('\n'.join([str(t) for t in Theme.objects.filter(name__istartswith=prefix)]))