fnp
/
wolnelektury.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add Book.ancestor m2m.
[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
8891602
..
bb1b4bc
100755
(executable)
--- a/
apps/social/templatetags/social_tags.py
+++ b/
apps/social/templatetags/social_tags.py
@@
-2,6
+2,8
@@
# This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
#
# This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
# 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
@@
-20,16
+22,23
@@
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)
else:
cites = cites_for_tags(ctx)
- cite = cites.order_by('-sticky', '?')[0] if cites.exists() else None
+ stickies = cites.filter(sticky=True)
+ count = stickies.count()
+ if count:
+ cite = stickies[randint(0, count - 1)]
+ else:
+ count = cites.count()
+ if count:
+ cite = cites[randint(0, count - 1)]
+ else:
+ cite = None
return cite
return cite