4958: Merge branch 'master' into 4958-old-browser-alert

[arvados.git] / apps / workbench / app / views / jobs / _show_log.html.erb

diff --git a/apps/workbench/app/views/jobs/_show_log.html.erb b/apps/workbench/app/views/jobs/_show_log.html.erb
index 8082d6f5a44f42d21fe07830c2978df45c5e3961..315c8c1831242faedef0c0a1a10b1991f88e06c7 100644 (file)
--- a/apps/workbench/app/views/jobs/_show_log.html.erb
+++ b/apps/workbench/app/views/jobs/_show_log.html.erb
@@ -1,11 +1,13 @@
 <% if !@object.log %>
 
-<% log_history = stderr_log_history([@object.uuid]) %>
+<div id="log_graph_div"
+     class="arv-log-event-listener"
+     data-object-uuid="<%= @object.uuid %>"></div>
 
 <div id="event_log_div"
      class="arv-log-event-listener arv-log-event-handler-append-logs arv-job-log-window"
      data-object-uuid="<%= @object.uuid %>"
-     ><%= log_history.join("\n") %></div>
+     ></div>
 
 <%# Applying a long throttle suppresses the auto-refresh of this
     partial that would normally be triggered by arv-log-event. %>
@@ -56,7 +58,7 @@ var makeFilter = function() {
   });
 }
 
-<% if @object.log %>
+<% if @object.log and !@object.log.empty? %>
   <% logcollection = Collection.find @object.log %>
   <% if logcollection %>
     log_size = <%= logcollection.files[0][2] %>