mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-07-05 02:09:13 +00:00
Code Issues 32 Releases Wiki Activity

[per-object-permissions] Fixed bug in if_has_perm tag that would cause it to not work if an object paramter was not passed to it

Browse Source 
git-svn-id: http://code.djangoproject.com/svn/django/branches/per-object-permissions@3614 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Christopher Long 2006-08-19 16:26:11 +00:00
parent f180bb6ab3
commit da50848a71
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
django/contrib/auth/templatetags/auth.py
View File

@ -33,11 +33,11 @@ def if_has_perm(parser, token):
if tokens[1] is "not": if tokens[1] is "not":
not_flag = True not_flag = True
permission=tokens[2] permission=tokens[2]
if tokens[3]: if len(tokens)>3:
object=tokens[3] object=tokens[3]
else: else:
permission=tokens[1] permission=tokens[1]
if tokens[2]: if len(tokens)>2:
object=tokens[2] object=tokens[2]
if not (permission[0] == permission[-1] and permission[0] in ('"', "'")): if not (permission[0] == permission[-1] and permission[0] in ('"', "'")):
@ -69,11 +69,14 @@ class HasPermNode(template.Node):
nodes.extend(self.nodelist_false.get_nodes_by_type(nodetype)) nodes.extend(self.nodelist_false.get_nodes_by_type(nodetype))
return nodes return nodes
def render(self, context): def render(self, context):
try: if self.object_name:
object = template.resolve_variable(self.object_name, context) try:
except template.VariableDoesNotExist: object = template.resolve_variable(self.object_name, context)
return '' except template.VariableDoesNotExist:
return ''
else:
object=None
try: try:
user = template.resolve_variable("user", context) user = template.resolve_variable("user", context)
@ -86,5 +89,6 @@ class HasPermNode(template.Node):
return self.nodelist_true.render(context) return self.nodelist_true.render(context)
if (self.not_flag and bool_perm) or (not self.not_flag and not bool_perm): if (self.not_flag and bool_perm) or (not self.not_flag and not bool_perm):
return self.nodelist_false.render(context) return self.nodelist_false.render(context)
return ''
register.tag('if_has_perm', if_has_perm) register.tag('if_has_perm', if_has_perm)