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

Convert more apps to new navigation system

Browse Source
This commit is contained in:
Roberto Rosario
2015-04-04 18:47:16 -04:00
parent 39e8e26f87
commit 73a24b71b3
17 changed files with 173 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
mayan/apps/navigation/classes.py
View File

@@ -90,13 +90,18 @@ class Menu(object):
for resolved_navigation_object in resolved_navigation_object_list:
for source, links in self.bound_links.iteritems():
if inspect.isclass(source) and isinstance(resolved_navigation_object, source) or source == CombinedSource(obj=(resolved_navigation_object), view=current_view):
for link in links:
resolved_link = link.resolve(context)
if resolved_link:
result.append(resolved_link)
try:
if inspect.isclass(source) and isinstance(resolved_navigation_object, source) or source == CombinedSource(obj=resolved_navigation_object, view=current_view):
for link in links:
resolved_link = link.resolve(context)
if resolved_link:
result.append(resolved_link)
#break # No need for further content object match testing
except TypeError:
# When source is a dictionary
pass
#break # No need for further content object match testing
# View links
for link in self.bound_links.get(current_view, []):