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

Merge remote-tracking branch 'origin/master' into feature/master_merge

Browse Source 
Signed-off-by: Roberto Rosario <roberto.rosario.gonzalez@gmail.com>
This commit is contained in:
Roberto Rosario
2017-03-14 15:57:38 -04:00
parent aaa9578047 ca7b8301a1
commit 63682a2945
44 changed files with 1810 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mayan/apps/document_states/links.py
View File

@@ -6,8 +6,8 @@ from navigation import Link
from .permissions import (
permission_workflow_create, permission_workflow_delete,
permission_workflow_edit, permission_workflow_transition,
permission_workflow_tools, permission_workflow_view,
permission_workflow_edit, permission_workflow_tools,
permission_workflow_view,
)
link_document_workflow_instance_list = Link(
@@ -82,7 +82,7 @@ link_workflow_instance_detail = Link(
view='document_states:workflow_instance_detail', args='resolved_object.pk'
)
link_workflow_instance_transition = Link(
permissions=(permission_workflow_transition,), text=_('Transition'),
text=_('Transition'),
view='document_states:workflow_instance_transition',
args='resolved_object.pk'
)