Merge pull request #27 from biodiv/master

compatibility with django 1.10, backwards compatible
chrisglass · Jan 13, 2018 · 708ff92 · 708ff92
2 parents 057f3ec + 3c3a4ec
commit 708ff92
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/rulez/templatetags/rulez_perms.py b/rulez/templatetags/rulez_perms.py
@@ -9,8 +9,15 @@ def __init__(self, codename, objname, varname):
         self.varname = varname
 
     def render(self, context):
-        user_obj = template.resolve_variable('user', context)
-        obj = template.resolve_variable(self.objname, context)
+        try:
+            user_obj = template.resolve_variable('user', context)
+        except:
+            user_obj = template.Variable('user').resolve(context)
+        try:
+            obj = template.resolve_variable(self.objname, context)
+        except:
+            obj = template.Variable(self.objname).resolve(context)
+
         context[self.varname] = user_obj.has_perm(self.codename, obj)
         return ''