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 251388347d81685e2100992c16a7c9dd14ef0d7c..315c8c1831242faedef0c0a1a10b1991f88e06c7 100644 (file)
--- a/apps/workbench/app/views/jobs/_show_log.html.erb
+++ b/apps/workbench/app/views/jobs/_show_log.html.erb
@@ -1,13 +1,13 @@
 <% if !@object.log %>
 
-<div id="log_graph_div" data-object-uuid="<%= @object.uuid %>"></div>
-
-<% 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. %>
@@ -15,23 +15,6 @@
      data-load-throttle="86486400000" <%# 1001 nights %>
      ></div>
 
-<%= javascript_tag do %>
-  var jobGraphData = [];
-  var jobGraphSeries = [];
-  <% stderr_log_records([@object.uuid]).each.with_index do |log_record, index| %>
-    <% puts log_record.to_yaml %>
-    var logLine = '<%=j log_record.properties[:text] %>';
-    processLogLineForChart( logLine, jobGraphSeries, jobGraphData );
-  <% end %>
-  var jobGraph = Morris.Line({
-    element: 'log_graph_div',
-    data: jobGraphData,
-    xkey: 't',
-    ykeys: jobGraphSeries,
-    labels: jobGraphSeries
-  });
-<% end %>
-
 <% else %>
 
 <script>
@@ -75,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] %>