diff --git a/app/views/dmsf_workflows/_log.html.erb b/app/views/dmsf_workflows/_log.html.erb
index 354e9ac1..fed69e6e 100644
--- a/app/views/dmsf_workflows/_log.html.erb
+++ b/app/views/dmsf_workflows/_log.html.erb
@@ -76,7 +76,9 @@
|
<%= format_time(revision.dmsf_workflow_started_at) if revision.dmsf_workflow_started_at %> |
- <% sql = "SELECT c.action, c.note, c.created_at, c.author_id, a.user_id, s.step, s.name 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, s.id, c.action DESC, c.created_at" %>
+ <%# SQLite3::SQLException: RIGHT and FULL OUTER JOINs are not currently supported %>
+ <%# sql = "SELECT c.action, c.note, c.created_at, c.author_id, a.user_id, s.step, s.name 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, s.id, c.action DESC, c.created_at" %>
+ <% sql = "SELECT c.action, c.note, c.created_at, c.author_id, a.user_id, s.step, s.name FROM dmsf_workflow_steps s LEFT OUTER JOIN dmsf_workflow_step_assignments a ON s.id = a.dmsf_workflow_step_id LEFT OUTER JOIN dmsf_workflow_step_actions c ON a.id = c.dmsf_workflow_step_assignment_id WHERE a.dmsf_file_revision_id = #{revision.id} ORDER BY s.step, s.id, c.action DESC, c.created_at" %>
<% result = DmsfWorkflowStep.connection.exec_query sql %>
<% last_step = 0 %>
<% result.each_with_index do |row, i| %>
@@ -88,7 +90,7 @@
<%= DmsfWorkflowStepAction.action_str(row['action']) %> |
<% if (row['step'].to_i == @dmsf_workflow.dmsf_workflow_steps.last.step) && (revision.workflow == DmsfWorkflow::STATE_APPROVED) && (row['action'] != DmsfWorkflowStepAction::ACTION_DELEGATE) %>
- <%= l(:title_approved) %>
+ <%= l(:title_approved) if row['created_at'].present? %>
<% else %>
<%= DmsfWorkflowStepAction.workflow_str(row['action']) %>
<% end %>
|