It's safe to edit accesskey on the list.

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

diff --git a/apps/wiki/models.py b/apps/wiki/models.py
index f35c307..a4dc794 100644 (file)
--- a/apps/wiki/models.py
+++ b/apps/wiki/models.py
@@ -7,7 +7,8 @@ import re
 import os
 import vstorage
 from vstorage import DocumentNotFound
 import os
 import vstorage
 from vstorage import DocumentNotFound

-from wiki import settings
+from wiki import settings, constants
+from django.utils.translation import ugettext_lazy as _

 
 from django.http import Http404
 
 
 from django.http import Http404
 


@@ -15,6 +16,9 @@ import logging
 logger = logging.getLogger("fnp.wiki")
 
 
 logger = logging.getLogger("fnp.wiki")
 
 

+STAGE_TAGS_RE = re.compile(r'^#stage-finished: (.*)$', re.MULTILINE)
+
+

 class DocumentStorage(object):
     def __init__(self, path):
         self.vstorage = vstorage.VersionedStorage(path)
 class DocumentStorage(object):
     def __init__(self, path):
         self.vstorage = vstorage.VersionedStorage(path)


@@ -60,10 +64,14 @@ class DocumentStorage(object):
         return list(self.vstorage.all_pages())
 
     def history(self, title):
         return list(self.vstorage.all_pages())
 
     def history(self, title):

-        return list(self.vstorage.page_history(title))
+        def stage_desc(match):
+            stage = match.group(1)
+            return _("Finished stage: %s") % constants.DOCUMENT_STAGES_DICT[stage]
+
+        for changeset in self.vstorage.page_history(title):
+            changeset['description'] = STAGE_TAGS_RE.sub(stage_desc, changeset['description'])
+            yield changeset

 
 

-    def _info(self, name):
-        return self.vstorage.page_meta(name)

 
 
 class Document(object):
 
 
 class Document(object):


@@ -108,11 +116,12 @@ class Document(object):
         return result
 
     def info(self):
         return result
 
     def info(self):

-        return dict(zip(
-            ('revision', 'last_update', 'last_comitter', 'commit_message'),
-            self.storage._info(self.name),
-        ))
+        return self.storage.vstorage.page_meta(self.name, self.revision)

 
 
 def getstorage():
     return DocumentStorage(settings.REPOSITORY_PATH)
 
 
 def getstorage():
     return DocumentStorage(settings.REPOSITORY_PATH)

+
+#
+# Django models
+#