diff options
author | Sol Jerome <sol.jerome@gmail.com> | 2015-10-01 19:58:20 -0500 |
---|---|---|
committer | Sol Jerome <sol.jerome@gmail.com> | 2015-10-01 19:58:20 -0500 |
commit | 35a2ad1d76790b62b3dbb41cb7fa112c81dc4d5f (patch) | |
tree | a451a77147bc9fabce6e224e2038eedc78e27969 /src/lib/Bcfg2/Reporting/templatetags | |
parent | 061bd6abbb598659554f28a1a5bba45fd6eca6da (diff) | |
parent | a505fb3b2df0d1eddfe7a92afb080b016e951a43 (diff) | |
download | bcfg2-35a2ad1d76790b62b3dbb41cb7fa112c81dc4d5f.tar.gz bcfg2-35a2ad1d76790b62b3dbb41cb7fa112c81dc4d5f.tar.bz2 bcfg2-35a2ad1d76790b62b3dbb41cb7fa112c81dc4d5f.zip |
Merge branch 'fix/django1.7' of https://github.com/AlexanderS/bcfg2
Diffstat (limited to 'src/lib/Bcfg2/Reporting/templatetags')
-rw-r--r-- | src/lib/Bcfg2/Reporting/templatetags/bcfg2_tags.py | 11 |
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: |