fnp
/
wolnelektury.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix custom pdf w/pictures
[wolnelektury.git]
/
src
/
catalogue
/
templatetags
/
catalogue_tags.py
diff --git
a/src/catalogue/templatetags/catalogue_tags.py
b/src/catalogue/templatetags/catalogue_tags.py
index
105306e
..
c02a5d7
100644
(file)
--- a/
src/catalogue/templatetags/catalogue_tags.py
+++ b/
src/catalogue/templatetags/catalogue_tags.py
@@
-302,7
+302,7
@@
class CatalogueURLNode(Node):
# @register.inclusion_tag('catalogue/tag_list.html')
# @register.inclusion_tag('catalogue/tag_list.html')
-def tag_list(tags, choices=None, category=None, list_type='
default
'):
+def tag_list(tags, choices=None, category=None, list_type='
books
'):
# print(tags, choices, category)
if choices is None:
choices = []
# print(tags, choices, category)
if choices is None:
choices = []
@@
-325,6
+325,7
@@
def tag_list(tags, choices=None, category=None, list_type='default'):
other = other.filter(items__content_type=ct).distinct()
if list_type == 'audiobooks':
other = other.filter(id__in=get_audiobook_tags())
other = other.filter(items__content_type=ct).distinct()
if list_type == 'audiobooks':
other = other.filter(id__in=get_audiobook_tags())
+ other = other.only('name', 'slug', 'category')
else:
other = []
else:
other = []
@@
-339,7
+340,7
@@
def tag_list(tags, choices=None, category=None, list_type='default'):
@register.inclusion_tag('catalogue/inline_tag_list.html')
@register.inclusion_tag('catalogue/inline_tag_list.html')
-def inline_tag_list(tags, choices=None, category=None, list_type='
default
'):
+def inline_tag_list(tags, choices=None, category=None, list_type='
books
'):
return tag_list(tags, choices, category, list_type)
return tag_list(tags, choices, category, list_type)
@@
-363,7
+364,7
@@
def work_list(context, object_list):
@register.inclusion_tag('catalogue/plain_list.html', takes_context=True)
@register.inclusion_tag('catalogue/plain_list.html', takes_context=True)
-def plain_list(context, object_list, with_initials=True, by_author=False, choice=None, book=None, list_type='
default
',
+def plain_list(context, object_list, with_initials=True, by_author=False, choice=None, book=None, list_type='
books
',
paged=True, initial_blocks=False):
names = [('', [])]
last_initial = None
paged=True, initial_blocks=False):
names = [('', [])]
last_initial = None
@@
-378,7
+379,7
@@
def plain_list(context, object_list, with_initials=True, by_author=False, choice
initial = obj.get_initial().upper()
if initial != last_initial:
last_initial = initial
initial = obj.get_initial().upper()
if initial != last_initial:
last_initial = initial
- names.append((obj.author_
str
() if by_author else initial, []))
+ names.append((obj.author_
unicode
() if by_author else initial, []))
names[-1][1].append(obj)
return {
'paged': paged,
names[-1][1].append(obj)
return {
'paged': paged,