X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/87e084d47c335cd6f0b3e91d614999f55d148044..c3fc1fa1087b5c12e287f6a7194d7a98fc27817e:/src/catalogue/models/collection.py?ds=sidebyside

diff --git a/src/catalogue/models/collection.py b/src/catalogue/models/collection.py
index bae1cc418..0150055e0 100644
--- 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'))
 
-    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',)
@@ -33,22 +34,22 @@ class Collection(models.Model):
         try:
             return re.search(r'\w', self.title, re.U).group(0)
         except AttributeError:
-            return None
+            return ''
 
     @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
-        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):
         from catalogue.models import Book
-        return Book.objects.filter(self.get_query())
+        return Book.objects.filter(self.get_query()).order_by('sort_key_author', 'sort_key')
 
     def flush_includes(self, languages=True):
         if not languages: