Prevent a race condition between "Replacing text" label and the save dialog, probably...

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

diff --git a/apps/wiki/views.py b/apps/wiki/views.py
index 1481734..f959426 100644 (file)
--- a/apps/wiki/views.py
+++ b/apps/wiki/views.py
@@ -1,6 +1,7 @@
 from datetime import datetime
 import os
 import logging
 from datetime import datetime
 import os
 import logging

+import urllib

 
 from django.conf import settings
 from django.core.urlresolvers import reverse
 
 from django.conf import settings
 from django.core.urlresolvers import reverse


@@ -210,7 +211,7 @@ def gallery(request, directory):
                     smart_unicode(directory))
 
         def map_to_url(filename):
                     smart_unicode(directory))
 
         def map_to_url(filename):

-            return ("%s/%s" % (base_url, smart_unicode(filename))).replace('?', '%3f')
+            return urllib.quote("%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')


@@ -277,6 +278,9 @@ def history(request, chunk_id):
                 "date": localize(change.created_at),
                 "publishable": _("Publishable") + "\n" if change.publishable else "",
                 "tag": ',\n'.join(unicode(tag) for tag in change.tags.all()),
                 "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 JSONResponse(changes)
 
             })
     return JSONResponse(changes)