X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/b2d342589a7889a3b096e7192453d53bd28eed7d..9ce7b544a0616db407be602ea453771fc9c0a6dd:/src/catalogue/models/collection.py diff --git a/src/catalogue/models/collection.py b/src/catalogue/models/collection.py index 15a4e2adc..f059cb3c9 100644 --- a/src/catalogue/models/collection.py +++ b/src/catalogue/models/collection.py @@ -1,9 +1,9 @@ -# -*- coding: utf-8 -*- # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later. # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. # from django.conf import settings from django.db import models +from django.urls import reverse from django.utils.translation import ugettext_lazy as _ from ssify import flush_ssi_includes import re @@ -14,10 +14,7 @@ class Collection(models.Model): title = models.CharField(_('title'), max_length=120, db_index=True) slug = models.SlugField(_('slug'), max_length=120, primary_key=True) description = models.TextField(_('description'), null=True, blank=True) - - models.SlugField(_('slug'), max_length=120, unique=True, db_index=True) book_slugs = models.TextField(_('book slugs')) - kind = models.CharField(_('kind'), max_length=10, blank=False, default='book', db_index=True, choices=(('book', _('book')), ('picture', _('picture')))) @@ -27,7 +24,7 @@ class Collection(models.Model): verbose_name_plural = _('collections') app_label = 'catalogue' - def __unicode__(self): + def __str__(self): return self.title def get_initial(self): @@ -36,14 +33,12 @@ class Collection(models.Model): except AttributeError: return '' - @models.permalink def get_absolute_url(self): - return "collection", [self.slug] + return reverse("collection", args=[self.slug]) def get_query(self): slugs = self.book_slugs.split() # allow URIs - # WTF slugs = [slug.rstrip('/').rsplit('/', 1)[-1] if '/' in slug else slug for slug in slugs] return models.Q(slug__in=slugs)