From 96e143208fec976c719f2559d5aed4aa3d1f47ad Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Sat, 26 Aug 2017 22:04:46 -0400 Subject: [PATCH] User resolved_object to ensure proper link resolution when navigating back from the action views. Signed-off-by: Roberto Rosario --- mayan/apps/document_states/links.py | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/mayan/apps/document_states/links.py b/mayan/apps/document_states/links.py index 5362361619..b5abe48d2b 100644 --- a/mayan/apps/document_states/links.py +++ b/mayan/apps/document_states/links.py @@ -23,15 +23,16 @@ link_setup_workflow_create = Link( link_setup_workflow_delete = Link( permissions=(permission_workflow_delete,), tags='dangerous', text=_('Delete'), view='document_states:setup_workflow_delete', - args='object.pk' + args='resolved_object.pk' ) link_setup_workflow_document_types = Link( permissions=(permission_workflow_edit,), text=_('Document types'), - view='document_states:setup_workflow_document_types', args='object.pk' + view='document_states:setup_workflow_document_types', + args='resolved_object.pk' ) link_setup_workflow_edit = Link( permissions=(permission_workflow_edit,), text=_('Edit'), - view='document_states:setup_workflow_edit', args='object.pk' + view='document_states:setup_workflow_edit', args='resolved_object.pk' ) link_setup_workflow_list = Link( permissions=(permission_workflow_view,), icon='fa fa-sitemap', @@ -58,7 +59,8 @@ link_setup_workflow_state_action_selection = Link( ) link_setup_workflow_state_create = Link( permissions=(permission_workflow_edit,), text=_('Create state'), - view='document_states:setup_workflow_state_create', args='object.pk' + view='document_states:setup_workflow_state_create', + args='resolved_object.pk' ) link_setup_workflow_state_delete = Link( permissions=(permission_workflow_edit,), tags='dangerous', @@ -67,28 +69,31 @@ link_setup_workflow_state_delete = Link( ) link_setup_workflow_state_edit = Link( permissions=(permission_workflow_edit,), text=_('Edit'), - view='document_states:setup_workflow_state_edit', args='object.pk' + view='document_states:setup_workflow_state_edit', args='resolved_object.pk' ) link_setup_workflow_states = Link( permissions=(permission_workflow_view,), text=_('States'), - view='document_states:setup_workflow_states', args='object.pk' + view='document_states:setup_workflow_states', args='resolved_object.pk' ) link_setup_workflow_transition_create = Link( permissions=(permission_workflow_edit,), text=_('Create transition'), - view='document_states:setup_workflow_transition_create', args='object.pk' + view='document_states:setup_workflow_transition_create', + args='resolved_object.pk' ) link_setup_workflow_transition_delete = Link( permissions=(permission_workflow_edit,), tags='dangerous', text=_('Delete'), view='document_states:setup_workflow_transition_delete', - args='object.pk' + args='resolved_object.pk' ) link_setup_workflow_transition_edit = Link( permissions=(permission_workflow_edit,), text=_('Edit'), - view='document_states:setup_workflow_transition_edit', args='object.pk' + view='document_states:setup_workflow_transition_edit', + args='resolved_object.pk' ) link_setup_workflow_transitions = Link( permissions=(permission_workflow_view,), text=_('Transitions'), - view='document_states:setup_workflow_transitions', args='object.pk' + view='document_states:setup_workflow_transitions', + args='resolved_object.pk' ) link_tool_launch_all_workflows = Link( icon='fa fa-sitemap',