Use format_html in simple_tag functions

This commit is contained in:
Tom Christie 2015-10-27 14:21:03 +00:00
parent fed691a304
commit c81acab7e0

View File

@ -41,8 +41,8 @@ def optional_login(request):
except NoReverseMatch: except NoReverseMatch:
return '' return ''
snippet = "<li><a href='{href}?next={next}'>Log in</a></li>".format(href=login_url, next=escape(request.path)) snippet = "<li><a href='{href}?next={next}'>Log in</a></li>"
return snippet return format_html(snippet, href=login_url, next=escape(request.path))
@register.simple_tag @register.simple_tag
@ -53,7 +53,8 @@ def optional_logout(request, user):
try: try:
logout_url = reverse('rest_framework:logout') logout_url = reverse('rest_framework:logout')
except NoReverseMatch: except NoReverseMatch:
return '<li class="navbar-text">{user}</li>'.format(user=escape(user)) snippet = '<li class="navbar-text">{user}</li>'
return format_html(snippet, user=escape(user))
snippet = """<li class="dropdown"> snippet = """<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown"> <a href="#" class="dropdown-toggle" data-toggle="dropdown">
@ -64,8 +65,7 @@ def optional_logout(request, user):
<li><a href='{href}?next={next}'>Log out</a></li> <li><a href='{href}?next={next}'>Log out</a></li>
</ul> </ul>
</li>""" </li>"""
return format_html(snippet, user=escape(user), href=logout_url, next=escape(request.path))
return snippet.format(user=user, href=logout_url, next=escape(request.path))
@register.simple_tag @register.simple_tag