fnp
/
wolnelektury.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Display fixes: shelf tags, search results.
[wolnelektury.git]
/
apps
/
social
/
templatetags
/
social_tags.py
diff --git
a/apps/social/templatetags/social_tags.py
b/apps/social/templatetags/social_tags.py
index
d6d3f71
..
bb1b4bc
100755
(executable)
--- a/
apps/social/templatetags/social_tags.py
+++ b/
apps/social/templatetags/social_tags.py
@@
-3,6
+3,7
@@
# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
#
from random import randint
# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
#
from random import randint
+from django.db.models import Q
from django import template
from catalogue.models import Book
from social.models import Cite
from django import template
from catalogue.models import Book
from social.models import Cite
@@
-21,13
+22,11
@@
def choose_cite(context, ctx=None):
assert request.user.is_staff
assert 'choose_cite' in request.GET
cite = Cite.objects.get(pk=request.GET['choose_cite'])
assert request.user.is_staff
assert 'choose_cite' in request.GET
cite = Cite.objects.get(pk=request.GET['choose_cite'])
- except
AssertionError, Cite.DoesNotExist
:
+ except
(AssertionError, Cite.DoesNotExist)
:
if ctx is None:
cites = Cite.objects.all()
elif isinstance(ctx, Book):
if ctx is None:
cites = Cite.objects.all()
elif isinstance(ctx, Book):
- cites = ctx.cite_set.all()
- if not cites.exists():
- cites = cites_for_tags([ctx.book_tag()])
+ cites = Cite.objects.filter(Q(book=ctx) | Q(book__ancestor=ctx))
else:
cites = cites_for_tags(ctx)
stickies = cites.filter(sticky=True)
else:
cites = cites_for_tags(ctx)
stickies = cites.filter(sticky=True)