no CAS,

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

diff --git a/apps/wiki/views.py b/apps/wiki/views.py
index 146db69..424de24 100644 (file)
--- a/apps/wiki/views.py
+++ b/apps/wiki/views.py
@@ -7,11 +7,17 @@ from lxml import etree
 
 from django.conf import settings
 
 
 from django.conf import settings
 

+from django.contrib import auth
+from django.contrib.auth.models import User
+from django.contrib.auth.decorators import login_required
+from django.db.models import Count
+from django.utils.http import urlquote_plus

 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,
 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 django import http
 from django.shortcuts import get_object_or_404, redirect
 from django.http import Http404


@@ -26,7 +32,8 @@ from django.middleware.gzip import GZipMiddleware
 
 import librarian.html
 import librarian.text
 
 import librarian.html
 import librarian.text

-from wiki.xml_tools import GradedText
+from wiki import xml_tools
+from apiclient import api_call

 
 #
 # Quick hack around caching problems, TODO: use ETags
 
 #
 # Quick hack around caching problems, TODO: use ETags


@@ -39,13 +46,66 @@ import operator
 MAX_LAST_DOCS = 10
 
 
 MAX_LAST_DOCS = 10
 
 

+@active_tab('all')

 @never_cache
 def document_list(request):
 @never_cache
 def document_list(request):

+    chunks_list = helpers.ChunksList(Chunk.objects.order_by(
+        'book__title', 'book', 'number'))
+
+    return direct_to_template(request, 'wiki/document_list.html', extra_context={
+        'books': chunks_list,
+        #'books': [helpers.BookChunks(b) for b in Book.objects.all().select_related()],
+        '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_list = helpers.ChunksList(Chunk.objects.filter(
+        user=None).order_by('book__title', 'book__id', 'number'))
+
+    return direct_to_template(request, 'wiki/document_list.html', extra_context={
+        'books': chunks_list,
+        '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_list = helpers.ChunksList(Chunk.objects.filter(
+        user=user).order_by('book__title', 'book', 'number'))
+

     return direct_to_template(request, 'wiki/document_list.html', extra_context={
     return direct_to_template(request, 'wiki/document_list.html', extra_context={

-        'books': Book.objects.all(),
+        'books': chunks_list,

         'last_books': sorted(request.session.get("wiki_last_books", {}).items(),
                         key=lambda x: x[1]['time'], reverse=True),
     })
         '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('chunk')).order_by(
+            '-count', 'last_name', 'first_name'),
+    })
+
+
+@never_cache
+def logout_then_redirect(request):
+    auth.logout(request)
+    return http.HttpResponseRedirect(urlquote_plus(request.GET.get('next', '/'), safe='/?='))

 
 
 @never_cache
 
 
 @never_cache


@@ -82,6 +142,7 @@ def editor(request, slug, chunk=None, template_name='wiki/document_details.html'
             "text_save": forms.DocumentTextSaveForm(prefix="textsave"),
             "text_revert": forms.DocumentTextRevertForm(prefix="textrevert"),
             "add_tag": forms.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,
     })
         },
         'REDMINE_URL': settings.REDMINE_URL,
     })


@@ -115,7 +176,10 @@ 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":
     slug = slug.replace(' ', '-')
 
     if request.method == "POST":


@@ -145,6 +209,7 @@ def create_missing(request, slug):
     })
 
 
     })
 
 

+@active_tab('upload')

 def upload(request):
     if request.method == "POST":
         form = forms.DocumentsUploadForm(request.POST, request.FILES)
 def upload(request):
     if request.method == "POST":
         form = forms.DocumentsUploadForm(request.POST, request.FILES)


@@ -254,7 +319,7 @@ def text(request, slug, chunk=None):
 
 @never_cache
 def book_xml(request, slug):
 
 @never_cache
 def book_xml(request, slug):

-    xml = get_object_or_404(Book, slug=slug).materialize(Book.publish_tag())
+    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
 
     response = http.HttpResponse(xml, content_type='application/xml', mimetype='application/wl+xml')
     response['Content-Disposition'] = 'attachment; filename=%s.xml' % slug


@@ -263,7 +328,7 @@ def book_xml(request, slug):
 
 @never_cache
 def book_txt(request, slug):
 
 @never_cache
 def book_txt(request, slug):

-    xml = get_object_or_404(Book, slug=slug).materialize(Book.publish_tag())
+    xml = get_object_or_404(Book, slug=slug).materialize()

     output = StringIO()
     # errors?
     librarian.text.transform(StringIO(xml), output)
     output = StringIO()
     # errors?
     librarian.text.transform(StringIO(xml), output)


@@ -275,7 +340,7 @@ def book_txt(request, slug):
 
 @never_cache
 def book_html(request, slug):
 
 @never_cache
 def book_html(request, slug):

-    xml = get_object_or_404(Book, slug=slug).materialize(Book.publish_tag())
+    xml = get_object_or_404(Book, slug=slug).materialize()

     output = StringIO()
     # errors?
     librarian.html.transform(StringIO(xml), output, parse_dublincore=False,
     output = StringIO()
     # errors?
     librarian.html.transform(StringIO(xml), output, parse_dublincore=False,


@@ -391,6 +456,7 @@ def history(request, slug, chunk=None):
                 "description": change.description,
                 "author": change.author_str(),
                 "date": change.created_at,
                 "description": change.description,
                 "author": change.author_str(),
                 "date": change.created_at,

+                "publishable": "Publishable\n" if change.publishable else "",

                 "tag": ',\n'.join(unicode(tag) for tag in change.tags.all()),
             })
     return JSONResponse(changes)
                 "tag": ',\n'.join(unicode(tag) for tag in change.tags.all()),
             })
     return JSONResponse(changes)


@@ -399,31 +465,94 @@ def history(request, slug, chunk=None):
 def book(request, slug):
     book = get_object_or_404(Book, slug=slug)
 
 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?
     # do we need some automation?

-    some_wl = False

     first_master = None
     chunks = []
     first_master = None
     chunks = []

+    need_fixing = False
+    choose_master = False

 
 

-    for chunk in book:
-        graded = GradedText(chunk.materialize())
+    length = len(book)
+    for i, chunk in enumerate(book):

         chunk_dict = {
             "chunk": chunk,
         chunk_dict = {
             "chunk": chunk,

-            "graded": graded,
+            "fix": [],
+            "grade": ""

             }
             }

+        graded = xml_tools.GradedText(chunk.materialize())

         if graded.is_wl():
         if graded.is_wl():

-            some_wl = True

             master = graded.master()
             if first_master is None:
                 first_master = master
             elif master != first_master:
             master = graded.master()
             if first_master is None:
                 first_master = master
             elif master != first_master:

-                chunk_dict['bad_master'] = 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)
 
         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,
     return direct_to_template(request, "wiki/book_detail.html", extra_context={
         "book": book,
         "chunks": chunks,

-        "some_wl": some_wl,
+        "need_fixing": need_fixing,
+        "choose_master": choose_master,

         "first_master": first_master,
         "first_master": first_master,

+        "form": form,

     })
 
 
     })
 
 


@@ -518,32 +647,50 @@ def add_tag(request, slug, chunk=None):
             raise Http404
 
         tag = form.cleaned_data['tag']
             raise Http404
 
         tag = form.cleaned_data['tag']

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

         doc.at_revision(revision).tags.add(tag)
         return JSONResponse({"message": _("Tag added")})
     else:
         return JSONFormInvalid(form)
 
 
         doc.at_revision(revision).tags.add(tag)
         return JSONResponse({"message": _("Tag added")})
     else:
         return JSONFormInvalid(form)
 
 

-"""
-import wlapi
-
-

 @require_POST
 @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:
     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', '')
 
 def themes(request):
     prefix = request.GET.get('q', '')