X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/5780495e13ec2d55bc2dee96dec372a9ea395462..2e92c3cceb30a57e2ef53f71bfeb7fe2b803774e:/apps/wiki/views.py

diff --git a/apps/wiki/views.py b/apps/wiki/views.py
index 69c98365..48e05c5c 100644
--- a/apps/wiki/views.py
+++ b/apps/wiki/views.py
@@ -12,7 +12,7 @@ from wiki.helpers import (JSONResponse, JSONFormInvalid, JSONServerError,
                 ajax_require_permission, recursive_groupby)
 from django import http
 
-from wiki.models import getstorage, DocumentNotFound, normalize_name, split_name, join_name
+from wiki.models import getstorage, DocumentNotFound, normalize_name, split_name, join_name, Theme
 from wiki.forms import DocumentTextSaveForm, DocumentTagForm, DocumentCreateForm
 from datetime import datetime
 from django.utils.encoding import smart_unicode
@@ -84,6 +84,7 @@ def editor(request, name, template_name='wiki/document_details.html'):
             "text_save": DocumentTextSaveForm(prefix="textsave"),
             "add_tag": DocumentTagForm(prefix="addtag"),
         },
+        'REDMINE_URL': settings.REDMINE_URL,
     })
 
 
@@ -96,7 +97,7 @@ def editor_readonly(request, name, template_name='wiki/document_details_readonly
     try:
         revision = request.GET['revision']
         document = storage.get(name, revision)
-    except (KeyError, DocumentNotFound) as e:
+    except (KeyError, DocumentNotFound):
         raise http.Http404
 
     access_time = datetime.now()
@@ -113,6 +114,7 @@ def editor_readonly(request, name, template_name='wiki/document_details_readonly
         'document_name': document.name,
         'document_info': dict(document.info(), readonly=True),
         'document_meta': document.meta,
+        'REDMINE_URL': settings.REDMINE_URL,
     })
 
 
@@ -148,23 +150,16 @@ def text(request, name):
 
     if request.method == 'POST':
         form = DocumentTextSaveForm(request.POST, prefix="textsave")
-
         if form.is_valid():
             revision = form.cleaned_data['parent_revision']
-
-            document = storage.get_or_404(name, revision)
+            document = storage.get_or_404(name, revision)          
             document.text = form.cleaned_data['text']
-
             comment = form.cleaned_data['comment']
-
-            if form.cleaned_data['stage_completed']:
-                comment += '\n#stage-finished: %s\n' % form.cleaned_data['stage_completed']
-
-            author = "%s <%s>" % (form.cleaned_data['author_name'], form.cleaned_data['author_email'])
-
-            storage.put(document, author=author, comment=comment, parent=revision)
-            document = storage.get(name)
-
+            if form.cleaned_data['stage_completed']:        
+                comment += '\n#stage-finished: %s\n' % form.cleaned_data['stage_completed']         
+            author = "%s <%s>" % (form.cleaned_data['author_name'], form.cleaned_data['author_email'])           
+            storage.put(document, author=author, comment=comment, parent=revision)           
+            document = storage.get(name)          
             return JSONResponse({
                 'text': document.plain_text if revision != document.revision else None,
                 'meta': document.meta(),
@@ -194,6 +189,24 @@ def text(request, name):
         })
 
 
+@never_cache
+@normalized_name
+@require_POST
+def revert(request, name):
+    storage = getstorage()
+    revision = request.POST['target_revision']
+
+    try:
+        document = storage.revert(name, revision)
+
+        return JSONResponse({
+            'text': document.plain_text if revision != document.revision else None,
+            'meta': document.meta(),
+            'revision': document.revision,
+        })
+    except DocumentNotFound:
+        raise http.Http404
+
 @never_cache
 def gallery(request, directory):
     try:
@@ -216,7 +229,7 @@ def gallery(request, directory):
         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) as e:
+    except (IndexError, OSError):
         logger.exception("Unable to fetch gallery")
         raise http.Http404
 
@@ -284,3 +297,8 @@ def publish(request, name):
         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)]))