fix custom pdf w/pictures

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

diff --git a/src/catalogue/models/collection.py b/src/catalogue/models/collection.py
index bae1cc4..15a4e2a 100644 (file)
--- a/src/catalogue/models/collection.py
+++ b/src/catalogue/models/collection.py
@@ -18,7 +18,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'))))
+    kind = models.CharField(_('kind'), max_length=10, blank=False, default='book', db_index=True,
+                            choices=(('book', _('book')), ('picture', _('picture'))))

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


@@ -33,17 +34,17 @@ class Collection(models.Model):
         try:
             return re.search(r'\w', self.title, re.U).group(0)
         except AttributeError:
         try:
             return re.search(r'\w', self.title, re.U).group(0)
         except AttributeError:

-            return None
+            return ''

 
     @models.permalink
     def get_absolute_url(self):
 
     @models.permalink
     def get_absolute_url(self):

-        return ("collection", [self.slug])
+        return "collection", [self.slug]

 
     def get_query(self):
         slugs = self.book_slugs.split()
         # allow URIs
 
     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]
+        # WTF
+        slugs = [slug.rstrip('/').rsplit('/', 1)[-1] if '/' in slug else slug for slug in slugs]

         return models.Q(slug__in=slugs)
 
     def get_books(self):
         return models.Q(slug__in=slugs)
 
     def get_books(self):