From 35b44e70c79053de8caa02d04736ac9310212512 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Mon, 6 Apr 2015 02:23:04 -0400 Subject: [PATCH] Fix CombinedSource logic after get_multi_item_links_form updates --- mayan/apps/navigation/classes.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mayan/apps/navigation/classes.py b/mayan/apps/navigation/classes.py index 6eb2396584..fa1feef3bc 100644 --- a/mayan/apps/navigation/classes.py +++ b/mayan/apps/navigation/classes.py @@ -87,12 +87,13 @@ class Menu(object): for resolved_navigation_object in resolved_navigation_object_list: for source, links in self.bound_links.iteritems(): try: - if inspect.isclass(source) and isinstance(resolved_navigation_object, source) or source == CombinedSource(obj=resolved_navigation_object, view=current_view): + if inspect.isclass(source) and isinstance(resolved_navigation_object, source) or source == CombinedSource(obj=resolved_navigation_object.__class__, view=current_view): for link in links: resolved_link = link.resolve(context=context, resolved_object=resolved_navigation_object) if resolved_link: result.append(resolved_link) #break # No need for further content object match testing + # TODO: profile this except TypeError: # When source is a dictionary