even more tutorial in editor (status bar, undo, redo)

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

diff --git a/apps/wiki/views.py b/apps/wiki/views.py
index 1b16077..461f110 100644 (file)
--- a/apps/wiki/views.py
+++ b/apps/wiki/views.py
@@ -15,6 +15,7 @@ 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.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 django.utils.translation import ugettext as _
 from django.views.decorators.http import require_POST
 from django.shortcuts import get_object_or_404, render


@@ -41,7 +42,7 @@ def get_history(document):
         revisions.append({
             "version": i + 1,
             "description": revision.description,
         revisions.append({
             "version": i + 1,
             "description": revision.description,

-            "author": revision.author_str(),
+            "author": escape(revision.author_str()),

             "date": localize(revision.created_at),
             "revision": revision.pk,
             "published": _("Published") + ": " +
             "date": localize(revision.created_at),
             "revision": revision.pk,
             "published": _("Published") + ": " +


@@ -68,7 +69,8 @@ def editor(request, pk, template_name='wiki/bootstrap.html'):
             'version': len(history),
             'revision': revision.pk,
             'stage': doc.stage,
             'version': len(history),
             'revision': revision.pk,
             'stage': doc.stage,

-            'assignment': str(doc.assigned_to),
+            'stage_name': doc.stage_name(),
+            'assignment': doc.assigned_to.username if doc.assigned_to else None,

         }),
         'serialized_templates': json.dumps([
             {'id': t.id, 'name': t.name, 'content': t.content} for t in Template.objects.filter(is_partial=True)
         }),
         'serialized_templates': json.dumps([
             {'id': t.id, 'name': t.name, 'content': t.content} for t in Template.objects.filter(is_partial=True)


@@ -119,11 +121,11 @@ def text(request, doc_id):
                 from traceback import print_exc
                 print_exc()
                 raise
                 from traceback import print_exc
                 print_exc()
                 raise

-            # revision = doc.revision()

             return JSONResponse({
                 'text': None,  # doc.materialize() if parent_revision != revision else None,
             return JSONResponse({
                 'text': None,  # doc.materialize() if parent_revision != revision else None,

-                # 'version': revision,
-                # 'stage': doc.stage.name if doc.stage else None,
+                'version': len(get_history(doc)),
+                'stage': doc.stage,
+                'stage_name': doc.stage_name(),

                 'assignment': doc.assigned_to.username if doc.assigned_to else None
             })
         else:
                 'assignment': doc.assigned_to.username if doc.assigned_to else None
             })
         else:


@@ -176,8 +178,11 @@ def revert(request, doc_id):
         )
 
         return JSONResponse({
         )
 
         return JSONResponse({

-            # 'document': None, #doc.materialize() if before != doc.revision else None,
-            # 'version': doc.revision(),
+            'document': doc.materialize(),
+            'version': len(get_history(doc)),
+            'stage': doc.stage,
+            'stage_name': doc.stage_name(),
+            'assignment': doc.assigned_to.username if doc.assigned_to else None,

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