Priviliged users can now add tags. Also, some minor cleanups in JS.

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

diff --git a/apps/wiki/views.py b/apps/wiki/views.py
index 29039b7..dbc05df 100644 (file)
--- a/apps/wiki/views.py
+++ b/apps/wiki/views.py
@@ -1,15 +1,18 @@
 import os
 
 from django.conf import settings
 import os
 
 from django.conf import settings

+

 from django.views.generic.simple import direct_to_template
 from django.views.decorators.http import require_POST
 from django.views.generic.simple import direct_to_template
 from django.views.decorators.http import require_POST

-from .helpers import JSONResponse, JSONFormInvalid, JSONServerError
+from wiki.helpers import JSONResponse, JSONFormInvalid, JSONServerError, ajax_require_permission

 from django import http
 
 from wiki.models import getstorage
 from django import http
 
 from wiki.models import getstorage

-from wiki.forms import DocumentForm, DocumentTextSaveForm, DocumentTagForm
+from wiki.forms import DocumentTextSaveForm, DocumentTagForm

 from datetime import datetime
 from django.utils.encoding import smart_unicode
 from datetime import datetime
 from django.utils.encoding import smart_unicode

+from django.utils.translation import ugettext_lazy as _
+

 import wlapi
 
 #
 import wlapi
 
 #


@@ -25,68 +28,70 @@ import operator
 
 MAX_LAST_DOCS = 10
 
 
 MAX_LAST_DOCS = 10
 

+

 @never_cache
 @never_cache

-def document_list(request, template_name = 'wiki/document_list.html'):
+def document_list(request, template_name='wiki/document_list.html'):

     # TODO: find a way to cache "Storage All"
     # TODO: find a way to cache "Storage All"

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

         'document_list': getstorage().all(),
         'document_list': getstorage().all(),

-        'last_docs': sorted(request.session.get("wiki_last_docs", {}).items(), 
-                        key=operator.itemgetter(1), reverse = True)
-    })  
+        'last_docs': sorted(request.session.get("wiki_last_docs", {}).items(),
+                        key=operator.itemgetter(1), reverse=True),
+    })
+

 
 @never_cache
 
 @never_cache

-def document_detail(request, name, template_name = 'wiki/document_details.html'):
-    
+def document_detail(request, name, template_name='wiki/document_details.html'):
+

     document = getstorage().get_or_404(name)
     document = getstorage().get_or_404(name)

-    
+

     access_time = datetime.now()
     access_time = datetime.now()

-    last_documents = request.session.get("wiki_last_docs", {})      
+    last_documents = request.session.get("wiki_last_docs", {})

     last_documents[name] = access_time
     last_documents[name] = access_time

-    
+

     if len(last_documents) > MAX_LAST_DOCS:
     if len(last_documents) > MAX_LAST_DOCS:

-        oldest_key = min(last_documents, key = last_documents.__getitem__)
-        del last_documents[oldest_key]        
-    request.session['wiki_last_docs'] = last_documents      
+        oldest_key = min(last_documents, key=last_documents.__getitem__)
+        del last_documents[oldest_key]
+    request.session['wiki_last_docs'] = last_documents

 
 

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

         'document': document,
         'document_info': document.info,
         'document_meta': document.meta,
         'document': document,
         'document_info': document.info,
         'document_meta': document.meta,

-        'forms': {"text_save": DocumentTextSaveForm(), "add_tag": DocumentTagForm() },         
+        'forms': {"text_save": DocumentTextSaveForm(), "add_tag": DocumentTagForm()},

     })
 
     })
 

+

 @never_cache
 @never_cache

-def document_text(request, name):    
+def document_text(request, name):

     storage = getstorage()
     storage = getstorage()

-    document = storage.get_or_404(name) 
-    
-    if request.method == 'POST':        
+    document = storage.get_or_404(name)
+
+    if request.method == 'POST':

         form = DocumentTextSaveForm(request.POST)
         form = DocumentTextSaveForm(request.POST)

-        
-        if form.is_valid():            
+
+        if form.is_valid():

             revision = form.cleaned_data['parent_revision']
             document.text = form.cleaned_data['text']
             revision = form.cleaned_data['parent_revision']
             document.text = form.cleaned_data['text']

-            
-            storage.put(document, 
-                author = form.cleaned_data['author'] or request.user.username, 
-                comment = form.cleaned_data['comment'],
-                parent = revision 
+
+            storage.put(document,
+                author=form.cleaned_data['author'] or request.user.username,
+                comment=form.cleaned_data['comment'],
+                parent=revision,

             )
             )

-                        
+

             return JSONResponse({
             return JSONResponse({

-                'text': document.plain_text if revision != document.revision() else None, 
-                'meta': document.meta(), 
-                'revision': document.revision() 
+                'text': document.plain_text if revision != document.revision() else None,
+                'meta': document.meta(),
+                'revision': document.revision(),

             })
         else:
             })
         else:

-            return JSONFormInvalid(form)                            
+            return JSONFormInvalid(form)

     else:
         return JSONResponse({
     else:
         return JSONResponse({

-            'text': document.plain_text, 
-            'meta': document.meta(), 
-            'revision': document.revision()
+            'text': document.plain_text,
+            'meta': document.meta(),
+            'revision': document.revision(),

         })
         })

-   

 
 
 @never_cache
 
 
 @never_cache


@@ -96,71 +101,83 @@ def document_gallery(request, directory):
                         smart_unicode(settings.MEDIA_URL),
                         smart_unicode(settings.FILEBROWSER_DIRECTORY),
                         smart_unicode(directory)))
                         smart_unicode(settings.MEDIA_URL),
                         smart_unicode(settings.FILEBROWSER_DIRECTORY),
                         smart_unicode(directory)))

-        
+

         base_dir = os.path.join(
         base_dir = os.path.join(

-                    smart_unicode(settings.MEDIA_ROOT), 
+                    smart_unicode(settings.MEDIA_ROOT),

                     smart_unicode(settings.FILEBROWSER_DIRECTORY),
                     smart_unicode(directory))
                     smart_unicode(settings.FILEBROWSER_DIRECTORY),
                     smart_unicode(directory))

-        
+

         def map_to_url(filename):
             return "%s/%s" % (base_url, smart_unicode(filename))
         def map_to_url(filename):
             return "%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')
         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 = [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), exc:
         import traceback
         traceback.print_exc()
         raise http.Http404
         images.sort()
         return JSONResponse(images)
     except (IndexError, OSError), exc:
         import traceback
         traceback.print_exc()
         raise http.Http404

-    
+
+

 @never_cache
 def document_diff(request, name):
 @never_cache
 def document_diff(request, name):

-    storage = getstorage()    
-    
+    storage = getstorage()
+

     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))

-    
+

     if revA > revB:
         revA, revB = revB, revA
     if revA > revB:
         revA, revB = revB, revA

-        
+

     if revB == 0:
     if revB == 0:

-        revB = None   
-         
+        revB = None
+

     docA = storage.get_or_404(name, int(revA))
     docA = storage.get_or_404(name, int(revA))

-    docB = storage.get_or_404(name, int(revB)) 
-        
-    return http.HttpResponse(nice_diff.html_diff_table(docA.plain_text.splitlines(), 
-                                         docB.plain_text.splitlines()) )                                           
-    
-@never_cache    
+    docB = storage.get_or_404(name, int(revB))
+
+    return http.HttpResponse(nice_diff.html_diff_table(docA.plain_text.splitlines(),
+                                         docB.plain_text.splitlines(), context=3))
+
+
+@never_cache

 def document_history(request, name):
     storage = getstorage()
 def document_history(request, name):
     storage = getstorage()

-    return JSONResponse(storage.history(name)) 
+
+    # TODO: pagination
+    changesets = storage.history(name)
+
+    return JSONResponse(changesets)
+

 
 @require_POST
 
 @require_POST

-def document_add_tag(request, name): 
+@ajax_require_permission('wiki.can_change_tags')
+def document_add_tag(request, name):

     storage = getstorage()
     storage = getstorage()

-    
+

     form = DocumentTagForm(request.POST)
     if form.is_valid():
     form = DocumentTagForm(request.POST)
     if form.is_valid():

-        doc = storage.get_or_404(name, form.cleaned_data['version'])
-        doc.add_tag(form.cleaned_data['tag'])
-        return JSONResponse({"message": _("Tag added")})  
+        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)
     else:
         return JSONFormInvalid(form)

-    
+
+

 @require_POST
 @require_POST

+@ajax_require_permission('wiki.can_publish')

 def document_publish(request, name, version):
     storage = getstorage()
 def document_publish(request, name, version):
     storage = getstorage()

-    
+

     # get the document
     # get the document

-    document = storage.get_or_404(name, revision = int(version))
-    
-    api = wlapi.WLAPI(settings.WL_API_CONFIG)    
-    try:        
+    document = storage.get_or_404(name, revision=int(version))
+
+    api = wlapi.WLAPI(settings.WL_API_CONFIG)
+    try:

         return JSONResponse({"result": api.publish_book(document)})
         return JSONResponse({"result": api.publish_book(document)})

-    except wlapi.APICallException, e:  
-        return JSONServerError({"message": str(e)})                     
\ No newline at end of file
+    except wlapi.APICallException, e:
+        return JSONServerError({"message": str(e)})