From dd779c8ea8d15cfc5d88cd94d14fb78f8f01718f Mon Sep 17 00:00:00 2001 From: Karel Picman Date: Tue, 9 Jan 2018 14:13:01 +0100 Subject: [PATCH] Delegated approvals were missing --- app/views/my/blocks/_open_approvals.html.erb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/views/my/blocks/_open_approvals.html.erb b/app/views/my/blocks/_open_approvals.html.erb index 5c6f04b4..254fdc65 100644 --- a/app/views/my/blocks/_open_approvals.html.erb +++ b/app/views/my/blocks/_open_approvals.html.erb @@ -23,8 +23,9 @@ <% assignments = Array.new %> <% if @user %> <% all_assignments = DmsfWorkflowStepAssignment.joins( - 'LEFT JOIN dmsf_workflow_step_actions ON dmsf_workflow_step_assignments.id = dmsf_workflow_step_actions.dmsf_workflow_step_assignment_id').where( - :dmsf_workflow_step_assignments => { :user_id => @user.id }, :dmsf_workflow_step_actions => { :id => nil }) %> + 'LEFT JOIN dmsf_workflow_step_actions ON dmsf_workflow_step_assignments.id = dmsf_workflow_step_actions.dmsf_workflow_step_assignment_id').where( + :dmsf_workflow_step_assignments => { :user_id => @user.id }).where( + ['dmsf_workflow_step_actions.id IS NULL OR dmsf_workflow_step_actions.action = ?', DmsfWorkflowStepAction::ACTION_DELEGATE]) %> <% all_assignments.each do |assignment| %> <% if assignment.dmsf_file_revision.dmsf_file.last_revision && !assignment.dmsf_file_revision.dmsf_file.last_revision.deleted? &&