X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/6c0f80a0b436aa78f3245c5a0b10d5d49a9a7dec..7e113c61d336d677b96ff0ed55a5f81eb2b80d53:/src/catalogue/models/collection.py

diff --git a/src/catalogue/models/collection.py b/src/catalogue/models/collection.py
index 0150055e0..3c4b475a6 100644
--- a/src/catalogue/models/collection.py
+++ b/src/catalogue/models/collection.py
@@ -14,10 +14,7 @@ class Collection(models.Model):
     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)
-
-    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'))))
 
@@ -27,7 +24,7 @@ class Collection(models.Model):
         verbose_name_plural = _('collections')
         app_label = 'catalogue'
 
-    def __unicode__(self):
+    def __str__(self):
         return self.title
 
     def get_initial(self):
@@ -43,13 +40,12 @@ class Collection(models.Model):
     def get_query(self):
         slugs = self.book_slugs.split()
         # allow URIs
-        # 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()).order_by('sort_key_author', 'sort_key')
+        return Book.objects.filter(self.get_query())
 
     def flush_includes(self, languages=True):
         if not languages: