Add grammar to tags. Also: respect custom tag slugs on publishing.

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

diff --git a/src/catalogue/models/collection.py b/src/catalogue/models/collection.py
index f059cb3..f1a582c 100644 (file)
--- a/src/catalogue/models/collection.py
+++ b/src/catalogue/models/collection.py
@@ -4,19 +4,29 @@
 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
+from django.utils.translation import gettext_lazy as _
 import re
+from wolnelektury.utils import cached_render, clear_cached_renders
 
 
 class Collection(models.Model):
     """A collection of books, which might be defined before publishing them."""
     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)
+    description = models.TextField(_('description'), blank=True)
     book_slugs = models.TextField(_('book slugs'))
+    authors = models.ManyToManyField(
+        'Tag',
+        limit_choices_to={'category': 'author'},
+        blank=True
+    )
     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',)
@@ -46,11 +56,14 @@ 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]
+    def get_5_books(self):
+        return self.get_books()[:5]
 
-        flush_ssi_includes([
-            '/katalog/%s.json' % lang for lang in languages])
+    @cached_render('catalogue/collection_box.html')
+    def box(self):
+        return {
+            'collection': self
+        }
+
+    def clear_cache(self):
+        clear_cached_renders(self.box)