X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/5b8b74cc22768b7d3144287f5bd9111479179383..9f5909ffb6a680a86c2da4a260df92df8e88c3b3:/apps/wiki/models.py?ds=sidebyside diff --git a/apps/wiki/models.py b/apps/wiki/models.py index 3e892adc..7cb20c65 100644 --- a/apps/wiki/models.py +++ b/apps/wiki/models.py @@ -9,6 +9,7 @@ import os import vstorage from vstorage import DocumentNotFound from wiki import settings, constants +from slughifi import slughifi from django.utils.translation import ugettext_lazy as _ from django.http import Http404 @@ -35,7 +36,7 @@ def normalize_name(name): >>> normalize_name("gąska".decode('utf-8')) u'g\u0105ska' """ - return name.translate(_PCHARS_DICT).lower() + return unicode(name).translate(_PCHARS_DICT) STAGE_TAGS_RE = re.compile(r'^#stage-finished: (.*)$', re.MULTILINE) @@ -52,9 +53,8 @@ class DocumentStorage(object): text, rev = self.vstorage.page_text_by_tag(name, tag) return Document(self, name=name, text=text, revision=rev) - def revert(self, name, revision): - text, rev = self.vstorage.revert(name, revision) - return Document(self, name=name, text=text, revision=rev) + def revert(self, name, revision, **commit_args): + self.vstorage.revert(name, revision, **commit_args) def get_or_404(self, *args, **kwargs): try: @@ -96,6 +96,9 @@ class DocumentStorage(object): changeset['description'] = STAGE_TAGS_RE.sub(stage_desc, changeset['description']) yield changeset + def doc_meta(self, title, revision=None): + return self.vstorage.page_meta(title, revision) + class Document(object): @@ -127,7 +130,7 @@ class Document(object): except ValueError: continue - gallery = result.get('gallery', self.name.replace(' ', '_')) + gallery = result.get('gallery', slughifi(self.name.replace(' ', '_'))) if gallery.startswith('/'): gallery = os.path.basename(gallery)