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 d964762..f1a582c 100644 (file)
--- a/src/catalogue/models/collection.py
+++ b/src/catalogue/models/collection.py
@@ -4,7 +4,7 @@
 from django.conf import settings
 from django.db import models
 from django.urls import reverse
 from django.conf import settings
 from django.db import models
 from django.urls import reverse

-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _

 import re
 from wolnelektury.utils import cached_render, clear_cached_renders
 
 import re
 from wolnelektury.utils import cached_render, clear_cached_renders
 


@@ -13,10 +13,16 @@ 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)
     """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'))
     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'))))
     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')),
     role = models.CharField(max_length=128, blank=True, db_index=True, choices=[
         ('', '–'),
         ('recommend', _('recommended')),


@@ -50,6 +56,9 @@ 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 get_5_books(self):
+        return self.get_books()[:5]
+

     @cached_render('catalogue/collection_box.html')
     def box(self):
         return {
     @cached_render('catalogue/collection_box.html')
     def box(self):
         return {