Minor fixes in picture publishing process.

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

diff --git a/apps/catalogue/models/collection.py b/apps/catalogue/models/collection.py
index 1c9027c..098501e 100644 (file)
--- a/apps/catalogue/models/collection.py
+++ b/apps/catalogue/models/collection.py
@@ -2,8 +2,10 @@
 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 # 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 django.db import models
 from django.utils.translation import ugettext_lazy as _

+from ssify import flush_ssi_includes

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


@@ -15,6 +17,8 @@ class Collection(models.Model):
     models.SlugField(_('slug'), max_length=120, unique=True, db_index=True)
     book_slugs = models.TextField(_('book slugs'))
 
     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'))))
+

     class Meta:
         ordering = ('title',)
         verbose_name = _('collection')
     class Meta:
         ordering = ('title',)
         verbose_name = _('collection')


@@ -23,3 +27,23 @@ class Collection(models.Model):
 
     def __unicode__(self):
         return self.title
 
     def __unicode__(self):
         return self.title

+
+    @models.permalink
+    def get_absolute_url(self):
+        return ("collection", [self.slug])
+
+    def get_query(self):
+        slugs = self.book_slugs.split()
+        # allow URIs
+        slugs = [slug.rstrip('/').rsplit('/', 1)[-1] if '/' in slug else slug
+                    for slug in slugs]
+        return models.Q(slug__in=slugs)
+
+    def flush_includes(self, languages=True):
+        if not languages:
+            return
+        if languages is True:
+            languages = [lc for (lc, _ln) in settings.LANGUAGES]
+
+        flush_ssi_includes([
+            '/katalog/%s.json' % lang for lang in languages])