X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/c6db46d42f0a6b9dbd5abb6ce2be58fe306752b6..c6d5dd71ad0d9bae811cc9002248d9399c7fdff7:/apps/social/templatetags/social_tags.py diff --git a/apps/social/templatetags/social_tags.py b/apps/social/templatetags/social_tags.py index d6d3f7110..bb1b4bca0 100755 --- 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 +from django.db.models import Q 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']) - except AssertionError, Cite.DoesNotExist: + except (AssertionError, Cite.DoesNotExist): 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)