From 71b0654342c58bf6b60480e740c1ae5485974561 Mon Sep 17 00:00:00 2001 From: Karel Picman Date: Wed, 8 Feb 2017 08:33:14 +0100 Subject: [PATCH] Documents approving in My Page --- app/views/my/blocks/_open_approvals.html.erb | 29 ++++++++++++++++---- 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/app/views/my/blocks/_open_approvals.html.erb b/app/views/my/blocks/_open_approvals.html.erb index 96ef6d1f..46d3f24f 100644 --- a/app/views/my/blocks/_open_approvals.html.erb +++ b/app/views/my/blocks/_open_approvals.html.erb @@ -3,7 +3,7 @@ # # Redmine plugin for Document Management System "Features" # -# Copyright (C) 2011-16 Karel Pičman +# Copyright (C) 2011-17 Karel Pičman # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -40,10 +40,11 @@ - - - - + + + + + @@ -76,9 +77,25 @@ <% end %> <% end %> + <% end %>
<%=l(:field_project)%><%=l(:field_label_dmsf_workflow)%><%=l(:label_document)%><%=l(:field_folder)%><%= l(:field_project) %><%= l(:field_label_dmsf_workflow) %><%= l(:label_document) %><%= l(:field_folder) %>
+ <% if assignment.dmsf_workflow_step.dmsf_workflow %> + <% assigns = assignment.dmsf_workflow_step.dmsf_workflow.next_assignments(assignment.dmsf_file_revision.id) %> + <% index = assigns.find_index{|assign| assign.user_id == User.current.id} if assigns %> + <% if index %> + <%= link_to(image_tag('waiting_for_approval.png', :plugin => 'redmine_dmsf'), + action_dmsf_workflow_path( + :project_id => assignment.dmsf_file_revision.dmsf_file.project.id, + :id => assignment.dmsf_workflow_step.dmsf_workflow.id, + :dmsf_workflow_step_assignment_id => assigns[index].id, + :dmsf_file_revision_id => assignment.dmsf_file_revision.id), + :title => l(:title_waiting_for_approval), + :remote => true) %> + <% end %> + <% end %> +
<% end %> -<% end %> \ No newline at end of file +<% end %>