Merge branch '6663-git-server' refs #6663

[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 da9c9fd61d721b6345a07dc4e2758dcaf11178c0..18021349e2d5e052fe1870bdb35d834f39c6e897 100644 (file)
--- a/apps/workbench/app/views/jobs/_show_log.html.erb
+++ b/apps/workbench/app/views/jobs/_show_log.html.erb
@@ -2,14 +2,13 @@
 
 <div id="log_graph_div"
      class="arv-log-event-listener"
+     style="display:none"
      data-object-uuid="<%= @object.uuid %>"></div>
 
-<% log_history = stderr_log_history([@object.uuid]) %>
-
 <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. %>
@@ -17,17 +16,6 @@
      data-load-throttle="86486400000" <%# 1001 nights %>
      ></div>
 
-<%= javascript_tag do %>
-  window.jobGraphData = [];
-  window.jobGraphSeries = [];
-  window.jobGraphMaxima = {};
-  <% stderr_log_records([@object.uuid],[['properties','~','crunchstat:.*-- interval']])
-        .each do |log_record| %>
-    processLogLineForChart( '<%=j log_record.properties[:text] %>' );
-  <% end %>
-  createJobGraph('log_graph_div');
-<% end %>
-
 <% else %>
 
 <script>
@@ -71,7 +59,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] %>