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

Remove tempory_navigation_links to a more meaningful extra_navigation_links

Browse Source
This commit is contained in:
Roberto Rosario
2014-11-11 17:11:49 -04:00
parent 5480a7c9a0
commit c0ea3276a3
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -165,8 +165,8 @@ class Link(object):
# TODO: improve name to 'injected...'
# TODO: remove, only used by staging files
try:
# Check for and inject a temporary navigation dictionary
temp_navigation_links = Variable('temporary_navigation_links').resolve(context)
# Check for an inject temporary navigation dictionary
temp_navigation_links = Variable('extra_navigation_links').resolve(context)
if temp_navigation_links:
links_dict.update(temp_navigation_links)
except VariableDoesNotExist:

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

@@ -149,8 +149,8 @@ def _get_object_navigation_links(context, menu_name=None, links_dict=object_navi
parsed_query_string = urlparse.parse_qs(query_string)
try:
# Check for and inject a temporary navigation dictionary
temp_navigation_links = Variable('temporary_navigation_links').resolve(context)
# Check for an inject temporary navigation dictionary
temp_navigation_links = Variable('extra_navigation_links').resolve(context)
except VariableDoesNotExist:
pass
else:

4
mayan/apps/sources/views.py
View File

@@ -145,7 +145,7 @@ class UploadBaseView(MultiFormView):
context.update({
'subtemplates_list': subtemplates_list,
'temporary_navigation_links': {
'extra_navigation_links': {
'form_header': {
'sources:upload_version': {
'links': self.tab_links['tab_links']
@@ -358,7 +358,7 @@ def staging_file_delete(request, staging_folder_pk, encoded_filename):
'object': staging_file,
'next': next,
'previous': previous,
'temporary_navigation_links': {'form_header': {'staging_file_delete': {'links': results['tab_links']}}},
'extra_navigation_links': {'form_header': {'staging_file_delete': {'links': results['tab_links']}}},
}, context_instance=RequestContext(request))