X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/39b99a8a8920dca527eb823b860303103389fd91..f39c00ef647a7f625d9bd61c570b89d7b9762c61:/src/catalogue/models/collection.py?ds=sidebyside diff --git a/src/catalogue/models/collection.py b/src/catalogue/models/collection.py index e95204341..739ad78ec 100644 --- a/src/catalogue/models/collection.py +++ b/src/catalogue/models/collection.py @@ -1,12 +1,12 @@ -# -*- 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 +from wolnelektury.utils import cached_render, clear_cached_renders class Collection(models.Model): @@ -24,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): @@ -33,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) @@ -48,11 +46,11 @@ class Collection(models.Model): from catalogue.models import Book return Book.objects.filter(self.get_query()) - def flush_includes(self, languages=True): - if not languages: - return - if languages is True: - languages = [lc for (lc, _ln) in settings.LANGUAGES] + @cached_render('catalogue/collection_box.html') + def box(self): + return { + 'collection': self + } - flush_ssi_includes([ - '/katalog/%s.json' % lang for lang in languages]) + def clear_cache(self): + clear_cached_renders(self.box)