fnp
/
wolnelektury.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tags wired to pictures
[wolnelektury.git]
/
apps
/
catalogue
/
models
/
collection.py
diff --git
a/apps/catalogue/models/collection.py
b/apps/catalogue/models/collection.py
index
daee484
..
acb01b6
100644
(file)
--- a/
apps/catalogue/models/collection.py
+++ b/
apps/catalogue/models/collection.py
@@
-15,6
+15,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')
@@
-27,3
+29,10
@@
class Collection(models.Model):
@models.permalink
def get_absolute_url(self):
return ("collection", [self.slug])
@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)