Authors in collections

[wolnelektury.git] / src / catalogue / models / collection.py

diff --git a/src/catalogue/models/collection.py b/src/catalogue/models/collection.py
index e952043..75c56ea 100644 (file)
--- 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
 # 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.utils.translation import ugettext_lazy as _
-from ssify import flush_ssi_includes
+from django.urls import reverse
+from django.utils.translation import gettext_lazy as _

 import re
 import re

+from wolnelektury.utils import cached_render, clear_cached_renders

 
 
 class Collection(models.Model):
 
 
 class Collection(models.Model):


@@ -15,8 +15,17 @@ class Collection(models.Model):
     slug = models.SlugField(_('slug'), max_length=120, primary_key=True)
     description = models.TextField(_('description'), null=True, blank=True)
     book_slugs = models.TextField(_('book slugs'))
     slug = models.SlugField(_('slug'), max_length=120, primary_key=True)
     description = models.TextField(_('description'), null=True, blank=True)
     book_slugs = models.TextField(_('book slugs'))

+    authors = models.ManyToManyField(
+        'Tag',
+        limit_choices_to={'category': 'author'}
+    )

     kind = models.CharField(_('kind'), max_length=10, blank=False, default='book', db_index=True,
                             choices=(('book', _('book')), ('picture', _('picture'))))
     kind = models.CharField(_('kind'), max_length=10, blank=False, default='book', db_index=True,
                             choices=(('book', _('book')), ('picture', _('picture'))))

+    listed = models.BooleanField(_('listed'), default=True, db_index=True)
+    role = models.CharField(max_length=128, blank=True, db_index=True, choices=[
+        ('', '–'),
+        ('recommend', _('recommended')),
+    ])

 
     class Meta:
         ordering = ('title',)
 
     class Meta:
         ordering = ('title',)


@@ -24,7 +33,7 @@ class Collection(models.Model):
         verbose_name_plural = _('collections')
         app_label = 'catalogue'
 
         verbose_name_plural = _('collections')
         app_label = 'catalogue'
 

-    def __unicode__(self):
+    def __str__(self):

         return self.title
 
     def get_initial(self):
         return self.title
 
     def get_initial(self):


@@ -33,14 +42,12 @@ class Collection(models.Model):
         except AttributeError:
             return ''
 
         except AttributeError:
             return ''
 

-    @models.permalink

     def get_absolute_url(self):
     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
 
     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)
 
         slugs = [slug.rstrip('/').rsplit('/', 1)[-1] if '/' in slug else slug for slug in slugs]
         return models.Q(slug__in=slugs)
 


@@ -48,11 +55,11 @@ class Collection(models.Model):
         from catalogue.models import Book
         return Book.objects.filter(self.get_query())
 
         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)