matthias/mayan-edms
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Clean up

Browse Source
This commit is contained in:
Roberto Rosario
2011-02-10 00:14:33 -04:00
parent b12ddb7cc4
commit f58c17e6c7
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apps/common/templatetags/navigation.py
View File

@@ -182,14 +182,14 @@ def _get_object_navigation_links(context, menu_name=None):
try:
links = object_navigation[menu_name][current_view]['links']
for link in resolve_links(context, links, current_view, current_path):
context_links.append(link)
context_links.append(link)
except KeyError:
pass
try:
links = object_navigation[menu_name][type(obj)]['links']
for link in resolve_links(context, links, current_view, current_path):
context_links.append(link)
context_links.append(link)
except KeyError:
pass
@@ -201,7 +201,7 @@ def resolve_template_variable(context, name):
return unescape_string_literal(name)
except ValueError:
#return Variable(name).resolve(context)
#Research if should return always as a str
#TODO: Research if should return always as a str
return str(Variable(name).resolve(context))
except TypeError:
return name