diff --git a/app/views/dmsf_workflows/_log.html.erb b/app/views/dmsf_workflows/_log.html.erb index 100d3aaf..959a8ea4 100644 --- a/app/views/dmsf_workflows/_log.html.erb +++ b/app/views/dmsf_workflows/_log.html.erb @@ -72,20 +72,20 @@ <% sql = "SELECT c.action, c.note, c.created_at, c.author_id, a.user_id, s.step FROM dmsf_workflow_step_actions c RIGHT JOIN dmsf_workflow_step_assignments a ON a.id = c.dmsf_workflow_step_assignment_id RIGHT JOIN dmsf_workflow_steps s ON s.id = a.dmsf_workflow_step_id WHERE a.dmsf_file_revision_id = #{revision.id} ORDER BY s.step, c.action DESC, c.created_at" %> <% result = DmsfWorkflowStep.connection.execute sql %> - <% result.each_with_index do |row, i| %> + <% result.each_with_index do |row, i| %> - <%= row[5] %> - <%= link_to_user User.find_by_id(row[3].present? ? row[3] : row[4]) %> - <%= DmsfWorkflowStepAction.action_str(row[0]) %> + <%= row['step'] %> + <%= link_to_user User.find_by_id(row['author_id'].present? ? row['author_id'] : row['user_id']) %> + <%= DmsfWorkflowStepAction.action_str(row['action']) %> - <% if((row[5].to_i == @workflow.dmsf_workflow_steps.last.step) && (revision.workflow == DmsfWorkflow::STATE_APPROVED) && (row[0] != DmsfWorkflowStepAction::ACTION_DELEGATE)) %> + <% if((row['step'].to_i == @workflow.dmsf_workflow_steps.last.step) && (revision.workflow == DmsfWorkflow::STATE_APPROVED) && (row['action'] != DmsfWorkflowStepAction::ACTION_DELEGATE)) %> <%= l(:title_approved) %> <% else %> - <%= DmsfWorkflowStepAction.workflow_str(row[0]) %> + <%= DmsfWorkflowStepAction.workflow_str(row['action']) %> <% end %> - <%= row[1] %> - <%= format_time(row[2]) if row[2].present? %> + <%= row['note'] %> + <%= format_time(row['created_at']) if row['created_at'].present? %> <% end %>