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

Remove unused navigation code

Browse Source
This commit is contained in:
Roberto Rosario
2014-07-04 00:34:47 -04:00
parent 6e050d8390
commit 74388515d9
3 changed files with 4 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mayan/apps/common/templates/generic_list_subtemplate.html
View File

@@ -139,13 +139,7 @@
{% copy_variable list_object_variable_name as "navigation_object_name" %}
{% endif %}
<td class="last">
{% if navigation_object_links %}
{% with navigation_object_links as overrided_object_links %}
{% object_navigation_template %}
{% endwith %}
{% else %}
{% object_navigation_template %}
{% endif %}
{% object_navigation_template %}
</td>
{% endif %}
</tr>

1
mayan/apps/documents/views.py
View File

@@ -296,7 +296,6 @@ def document_download(request, document_id=None, document_id_list=None, document
'hide_link': True,
'hide_object': True,
'hide_links': True,
'navigation_object_links': None,
'scrollable_content': True,
'scrollable_content_height': '200px',
'extra_columns': [

16
mayan/apps/navigation/templatetags/navigation_tags.py
View File

@@ -176,26 +176,16 @@ def _get_object_navigation_links(context, menu_name=None, links_dict=object_navi
query_string = urlparse.urlparse(previous_path).query
parsed_query_string = urlparse.parse_qs(query_string)
try:
"""
Override the navigation links dictionary with the provided
link list
"""
navigation_object_links = Variable('overrided_object_links').resolve(context)
if navigation_object_links:
return [link for link in resolve_links(context, navigation_object_links, current_view, current_path, parsed_query_string)]
except VariableDoesNotExist:
pass
try:
"""
Check for and inject a temporary navigation dictionary
"""
temp_navigation_links = Variable('temporary_navigation_links').resolve(context)
if temp_navigation_links:
links_dict.update(temp_navigation_links)
except VariableDoesNotExist:
pass
else:
if temp_navigation_links:
links_dict.update(temp_navigation_links)
try:
links = links_dict[menu_name][current_view]['links']