X-Git-Url: https://git.mdrn.pl/prawokultury.git/blobdiff_plain/891a1e056e6066b28e000df16d69b21946338a57..9f02a501d14c64933d1cea2107cf0bd5ff93d429:/migdal/models.py diff --git a/migdal/models.py b/migdal/models.py index 90a2d3c..97fbab3 100644 --- a/migdal/models.py +++ b/migdal/models.py @@ -6,10 +6,13 @@ from django.db import models from django.utils.translation import get_language, ugettext_lazy as _, ugettext from markupfield.fields import MarkupField from migdal.helpers import add_translatable -from migdal import settings +from migdal import app_settings + class Category(models.Model): + taxonomy = models.CharField(_('taxonomy'), max_length=32, + choices=app_settings.TAXONOMIES) class Meta: verbose_name = _('category') @@ -31,7 +34,7 @@ add_translatable(Category, { class Entry(models.Model): type = models.CharField(max_length=16, - choices=((t.db, t.slug) for t in settings.TYPES), + choices=((t.db, t.slug) for t in app_settings.TYPES), db_index=True) date = models.DateTimeField(auto_now_add=True, db_index=True) author = models.CharField(_('author'), max_length=128) @@ -51,7 +54,7 @@ class Entry(models.Model): def save(self, *args, **kwargs): # convert blank to null for slug uniqueness check to work - for lc, ln in settings.OPTIONAL_LANGUAGES: + for lc, ln in app_settings.OPTIONAL_LANGUAGES: slug_name = "slug_%s" % lc if hasattr(self, slug_name) == u'': setattr(self, slug_name, None) @@ -62,9 +65,9 @@ class Entry(models.Model): return ('migdal_entry_%s' % self.type, [self.slug]) def get_type(self): - return dict(settings.TYPES_DICT)[self.type] + return dict(app_settings.TYPES_DICT)[self.type] -add_translatable(Entry, languages=settings.OPTIONAL_LANGUAGES, fields={ +add_translatable(Entry, languages=app_settings.OPTIONAL_LANGUAGES, fields={ 'needed': models.CharField(_('needed'), max_length=1, db_index=True, choices=( ('n', _('Unneeded')), ('w', _('Needed')), ('y', _('Done'))), default='n'),