summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Sulfrian <alexander.sulfrian@fu-berlin.de>2015-09-23 23:28:11 +0200
committerAlexander Sulfrian <alexander.sulfrian@fu-berlin.de>2015-09-23 23:31:29 +0200
commit99024535e0381226f5a09a77cb05db67e441415b (patch)
treeef29813460e06bbd9afe2db2c374df539a9c582b
parent0fe55e5b3d2bff6e31ce9556d0f411118bd89c1d (diff)
downloadbcfg2-99024535e0381226f5a09a77cb05db67e441415b.tar.gz
bcfg2-99024535e0381226f5a09a77cb05db67e441415b.tar.bz2
bcfg2-99024535e0381226f5a09a77cb05db67e441415b.zip
Reporting: Replace get_template_from_string() for django 1.8
Django 1.8 introduced different template engines and droped the get_template_from_string function as it does not support the new feature.
-rw-r--r--src/lib/Bcfg2/Reporting/templatetags/bcfg2_tags.py11
1 files changed, 9 insertions, 2 deletions
diff --git a/src/lib/Bcfg2/Reporting/templatetags/bcfg2_tags.py b/src/lib/Bcfg2/Reporting/templatetags/bcfg2_tags.py
index 09aebc7fd..5c50c614d 100644
--- a/src/lib/Bcfg2/Reporting/templatetags/bcfg2_tags.py
+++ b/src/lib/Bcfg2/Reporting/templatetags/bcfg2_tags.py
@@ -1,11 +1,11 @@
import sys
from copy import copy
+import django
from django import template
from django.conf import settings
from django.core.urlresolvers import resolve, reverse, \
Resolver404, NoReverseMatch
-from django.template.loader import get_template_from_string
from django.utils.encoding import smart_str
from django.utils.safestring import mark_safe
from datetime import datetime, timedelta
@@ -394,6 +394,13 @@ class SortLinkNode(template.Node):
self.sort_key = template.Variable(sort_key)
self.text = template.Variable(text)
+ def _render_template(self, context):
+ if django.VERSION[0] == 1 and django.VERSION[1] >= 8:
+ return context.template.engine.from_string(self.__TMPL__)
+ else:
+ from django.template.loader import get_template_from_string
+ return get_template_from_string(self.__TMPL__).render(context)
+
def render(self, context):
try:
try:
@@ -419,7 +426,7 @@ class SortLinkNode(template.Node):
context.push()
context['key'] = sort_key
context['text'] = mark_safe(text)
- output = get_template_from_string(self.__TMPL__).render(context)
+ output = self._render_template(context)
context.pop()
return output
except: