X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/7100b7600042ac22687fb3036547841578b7e512..90c3f004c1f250e2370c78688c2fed831cf94b5e:/apps/wiki/models.py diff --git a/apps/wiki/models.py b/apps/wiki/models.py index acad2c3d..da8681aa 100644 --- a/apps/wiki/models.py +++ b/apps/wiki/models.py @@ -3,6 +3,7 @@ # This file is part of FNP-Redakcja, licensed under GNU Affero GPLv3 or later. # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. # +from django.db import models import re import os import vstorage @@ -32,9 +33,9 @@ def join_name(*parts, **kwargs): def normalize_name(name): """ >>> normalize_name("gąska".decode('utf-8')) - u'gaska' + 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) @@ -51,6 +52,10 @@ 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 get_or_404(self, *args, **kwargs): try: return self.get(*args, **kwargs) @@ -68,7 +73,7 @@ class DocumentStorage(object): 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'' @@ -139,3 +144,18 @@ def getstorage(): # # Django models # + +class Theme(models.Model): + name = models.CharField(_('name'), max_length=50, unique=True) + + class Meta: + ordering = ('name',) + verbose_name = _('theme') + verbose_name_plural = _('themes') + + def __unicode__(self): + return self.name + + def __repr__(self): + return "Theme(name=%r)" % self.name +