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

Improve link unbinding code for all cases.

Browse Source 
Signed-off-by: Roberto Rosario <roberto.rosario.gonzalez@gmail.com>
This commit is contained in:
Roberto Rosario
2017-07-16 02:20:47 -04:00
parent e5685eee04
commit 524a0d0c35
1 changed files with 11 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -155,7 +155,8 @@ class Menu(object):
resolved_object=resolved_navigation_object resolved_object=resolved_navigation_object
) )
if resolved_link: if resolved_link:
resolved_links.append(resolved_link) if resolved_link.link not in self.unbound_links.get(bound_source, ()):
resolved_links.append(resolved_link)
# No need for further content object match testing # No need for further content object match testing
break break
elif hasattr(resolved_navigation_object, 'get_deferred_fields') and resolved_navigation_object.get_deferred_fields() and isinstance(resolved_navigation_object, bound_source): elif hasattr(resolved_navigation_object, 'get_deferred_fields') and resolved_navigation_object.get_deferred_fields() and isinstance(resolved_navigation_object, bound_source):
@@ -166,7 +167,8 @@ class Menu(object):
resolved_object=resolved_navigation_object resolved_object=resolved_navigation_object
) )
if resolved_link: if resolved_link:
resolved_links.append(resolved_link) if resolved_link.link not in self.unbound_links.get(bound_source, ()):
resolved_links.append(resolved_link)
# No need for further content object match testing # No need for further content object match testing
break break
except TypeError: except TypeError:
@@ -181,7 +183,8 @@ class Menu(object):
for link in self.bound_links.get(current_view, []): for link in self.bound_links.get(current_view, []):
resolved_link = link.resolve(context=context) resolved_link = link.resolve(context=context)
if resolved_link: if resolved_link:
resolved_links.append(resolved_link) if resolved_link.link not in self.unbound_links.get(bound_source, ()):
resolved_links.append(resolved_link)
if resolved_links: if resolved_links:
result.append(resolved_links) result.append(resolved_links)
@@ -192,30 +195,17 @@ class Menu(object):
for link in self.bound_links.get(None, []): for link in self.bound_links.get(None, []):
if isinstance(link, Menu): if isinstance(link, Menu):
resolved_link = link resolved_link = link
else:
resolved_link = link.resolve(context=context)
if resolved_link:
resolved_links.append(resolved_link) resolved_links.append(resolved_link)
else:
# "Always show" links
resolved_link = link.resolve(context=context)
if resolved_link.link not in self.unbound_links.get(None, ()):
resolved_links.append(resolved_link)
if resolved_links: if resolved_links:
result.append(resolved_links) result.append(resolved_links)
if result: if result:
unbound_links = []
unbound_links.extend(self.unbound_links.get(source, ()))
unbound_links.extend(self.unbound_links.get(current_view, ()))
new_result = []
for resolved_link in result[0]:
try:
if resolved_link.link not in unbound_links:
new_result.append(resolved_link)
except AttributeError:
new_result.append(resolved_link)
result[0] = new_result
# Sort links by position value passed during bind # Sort links by position value passed during bind
result[0] = sorted( result[0] = sorted(
result[0], key=lambda item: self.link_positions.get(item.link) if isinstance(item, ResolvedLink) else self.link_positions.get(item) result[0], key=lambda item: self.link_positions.get(item.link) if isinstance(item, ResolvedLink) else self.link_positions.get(item)