From ee648b42ed27d61c64291830d919ffc63c0c580b Mon Sep 17 00:00:00 2001
From: Andre Anjos <andre.dos.anjos@gmail.com>
Date: Sat, 23 Apr 2016 20:07:07 +0200
Subject: [PATCH] [ui] Set format_html to simple_tag output to conform to
Django 1.9
---
beat/web/ui/templatetags/ui_tags.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/beat/web/ui/templatetags/ui_tags.py b/beat/web/ui/templatetags/ui_tags.py
index fc2671f6f..5705dd89f 100644
--- a/beat/web/ui/templatetags/ui_tags.py
+++ b/beat/web/ui/templatetags/ui_tags.py
@@ -27,6 +27,7 @@
from django import template
from django.conf import settings
+from django.utils.html import format_html
from ...common.texts import Messages as Texts
from ... import __version__
from collections import OrderedDict
@@ -223,7 +224,7 @@ def code_editor_scripts(modes):
js = ['<script src="%s%s?v%s" type="text/javascript" charset="utf-8"></script>' % (settings.STATIC_URL, k, __version__) for k in js]
- return '\n'.join(js)
+ return format_html('\n'.join(js))
#--------------------------------------------------
@@ -240,8 +241,7 @@ def code_editor_css():
if settings.CODEMIRROR_THEME != 'default':
css.append('%s/theme/%s.css' % (settings.CODEMIRROR_PATH, settings.CODEMIRROR_THEME))
- return '\n'.join(map(lambda x: '<link rel="stylesheet" href="%s%s?v%s" type="text/css" media="screen" />' % \
- (settings.STATIC_URL, x, __version__), css))
+ return format_html('\n'.join(map(lambda x: '<link rel="stylesheet" href="%s%s?v%s" type="text/css" media="screen" />' % (settings.STATIC_URL, x, __version__), css)))
#--------------------------------------------------
--
GitLab