#1557: colouring ampersand breaks XML

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

diff --git a/apps/wiki/models.py b/apps/wiki/models.py
index 5faf1d3..7cb20c6 100644 (file)
--- 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
 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
 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'
     """
     >>> 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)
 
 
 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)
 
         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:
 
     def get_or_404(self, *args, **kwargs):
         try:


@@ -73,7 +73,7 @@ class DocumentStorage(object):
         return document
 
     def create_document(self, text, name):
         return document
 
     def create_document(self, text, name):

-        title = u', '.join(p.title for p in split_name(name))
+        title = u', '.join(p.title() for p in split_name(name))

 
         if text is None:
             text = u''
 
         if text is None:
             text = u''


@@ -96,6 +96,9 @@ class DocumentStorage(object):
             changeset['description'] = STAGE_TAGS_RE.sub(stage_desc, changeset['description'])
             yield changeset
 
             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):
 
 
 class Document(object):


@@ -127,7 +130,7 @@ class Document(object):
                 except ValueError:
                     continue
 
                 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)
 
         if gallery.startswith('/'):
             gallery = os.path.basename(gallery)