Skip to content
This repository was archived by the owner on Apr 17, 2021. It is now read-only.

Commit 5f5a553

Browse files
committed
Compatibility with django110
Pass template.render() a dict instead of a context. The autoencoder parameter is now applied by marking the labels as safe html, causing them to render unencoded.
1 parent b69a91d commit 5f5a553

File tree

1 file changed

+13
-12
lines changed

1 file changed

+13
-12
lines changed

bootstrap_pagination/templatetags/bootstrap_pagination.py

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
from django.template.loader import get_template
66
from django.conf import settings
77
from django.http import QueryDict
8+
from django.utils.html import mark_safe
89

910
register = Library()
1011

@@ -68,10 +69,10 @@ def render(self, context):
6869
except VariableDoesNotExist:
6970
kwargs[argname] = None
7071

71-
previous_label = str(kwargs.get("previous_label", "Previous Page"))
72-
next_label = str(kwargs.get("next_label", "Next Page"))
73-
previous_title = str(kwargs.get("previous_title", "Previous Page"))
74-
next_title = str(kwargs.get("next_title", "Next Page"))
72+
previous_label = mark_safe(kwargs.get("previous_label", "Previous Page"))
73+
next_label = mark_safe(kwargs.get("next_label", "Next Page"))
74+
previous_title = mark_safe(kwargs.get("previous_title", "Previous Page"))
75+
next_title = mark_safe(kwargs.get("next_title", "Next Page"))
7576

7677
url_view_name = kwargs.get("url_view_name", None)
7778
if url_view_name is not None:
@@ -92,15 +93,15 @@ def render(self, context):
9293
next_page_url = get_page_url(page.next_page_number(), context.current_app, url_view_name, url_extra_args, url_extra_kwargs, url_param_name, url_get_params, url_anchor)
9394

9495
return get_template("bootstrap_pagination/pager.html").render(
95-
Context({
96+
{
9697
'page': page,
9798
'previous_label': previous_label,
9899
'next_label': next_label,
99100
'previous_title': previous_title,
100101
'next_title': next_title,
101102
'previous_page_url': previous_page_url,
102103
'next_page_url': next_page_url
103-
}, autoescape=False))
104+
})
104105

105106

106107
class BootstrapPaginationNode(Node):
@@ -136,11 +137,11 @@ def render(self, context):
136137
raise Exception("Optional argument \"size\" expecting one of \"small\", or \"large\"")
137138

138139
show_prev_next = strToBool(kwargs.get("show_prev_next", "true"))
139-
previous_label = str(kwargs.get("previous_label", "←"))
140-
next_label = str(kwargs.get("next_label", "→"))
140+
previous_label = mark_safe(kwargs.get("previous_label", "←"))
141+
next_label = mark_safe(kwargs.get("next_label", "→"))
141142
show_first_last = strToBool(kwargs.get("show_first_last", "false"))
142-
first_label = str(kwargs.get("first_label", "«"))
143-
last_label = str(kwargs.get("last_label", "»"))
143+
first_label = mark_safe(kwargs.get("first_label", "«"))
144+
last_label = mark_safe(kwargs.get("last_label", "»"))
144145
show_index_range = strToBool(kwargs.get("show_index_range", "false"))
145146

146147
url_view_name = kwargs.get("url_view_name", None)
@@ -207,7 +208,7 @@ def render(self, context):
207208
next_page_url = get_page_url(page.next_page_number(), context.current_app, url_view_name, url_extra_args, url_extra_kwargs, url_param_name, url_get_params, url_anchor)
208209

209210
return get_template("bootstrap_pagination/pagination.html").render(
210-
Context({
211+
{
211212
'page': page,
212213
'size': size,
213214
'show_index_range': show_index_range,
@@ -222,7 +223,7 @@ def render(self, context):
222223
'last_page_url': last_page_url,
223224
'previous_page_url': previous_page_url,
224225
'next_page_url': next_page_url
225-
}, autoescape=False))
226+
})
226227

227228

228229
@register.tag

0 commit comments

Comments
 (0)