Navigation

Changeset 3614

Timestamp:

08/19/06 11:26:11 (2 years ago)

Author:

clong

Message:

[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

Files:

r3589	r3614
34	34	not_flag = True
35	35	permission=tokens[2]
36		if ~~tokens[3]~~:
	36	if len(tokens)>3:
37	37	object=tokens[3]
38	38	else:
39	39	permission=tokens[1]
40		if ~~tokens[2]~~:
	40	if len(tokens)>2:
41	41	object=tokens[2]
42	42
…	…
70	70	return nodes
71	71
72		def render(self, context):
73		try:
74		object = template.resolve_variable(self.object_name, context)
75		except template.VariableDoesNotExist:
76		return ''
	72	def render(self, context):
	73	if self.object_name:
	74	try:
	75	object = template.resolve_variable(self.object_name, context)
	76	except template.VariableDoesNotExist:
	77	return ''
	78	else:
	79	object=None
77	80
78	81	try:
…	…
87	90	if (self.not_flag and bool_perm) or (not self.not_flag and not bool_perm):
88	91	return self.nodelist_false.render(context)
	92	return ''
89	93
90	94	register.tag('if_has_perm', if_has_perm)