Bar text update.

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

diff --git a/src/catalogue/models/collection.py b/src/catalogue/models/collection.py
index d519328..3c4b475 100644 (file)
--- a/src/catalogue/models/collection.py
+++ b/src/catalogue/models/collection.py
@@ -14,11 +14,9 @@ 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)
     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'))
     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',)


@@ -26,7 +24,7 @@ class Collection(models.Model):
         verbose_name_plural = _('collections')
         app_label = 'catalogue'
 
         verbose_name_plural = _('collections')
         app_label = 'catalogue'
 

-    def __unicode__(self):
+    def __str__(self):

         return self.title
 
     def get_initial(self):
         return self.title
 
     def get_initial(self):


@@ -37,13 +35,12 @@ class Collection(models.Model):
 
     @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]
+        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):