X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/32974185d5e2b1bdc197b4f5dcab259b5de3c6b4..0702033b4cbc642fc9f2742e9fed703d9dae9389:/apps/wiki/models.py

diff --git a/apps/wiki/models.py b/apps/wiki/models.py
index ad15c5ee..a4dc7941 100644
--- a/apps/wiki/models.py
+++ b/apps/wiki/models.py
@@ -7,7 +7,8 @@ import re
 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
 
@@ -15,6 +16,9 @@ import logging
 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)
@@ -24,7 +28,7 @@ class DocumentStorage(object):
         return Document(self, name=name, text=text, revision=rev)
 
     def get_by_tag(self, name, tag):
-        text, rev = self.vstorage.page_text(name, tag)
+        text, rev = self.vstorage.page_text_by_tag(name, tag)
         return Document(self, name=name, text=text, revision=rev)
 
     def get_or_404(self, *args, **kwargs):
@@ -60,10 +64,14 @@ class DocumentStorage(object):
         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):
@@ -108,11 +116,12 @@ class Document(object):
         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)
+
+#
+# Django models
+#