[ARVADOS] updated: c9ba2ec79e3e38bc3e1adc93173d82f1b763976b

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/app/views/jobs/_show_log.html.erb | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

       via  c9ba2ec79e3e38bc3e1adc93173d82f1b763976b (commit)
      from  f7ea83efa36ad9035cae34ac3b9ee5216347af20 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit c9ba2ec79e3e38bc3e1adc93173d82f1b763976b
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Thu Jun 12 09:56:52 2014 -0400

    2883: Removed commented out code related to live loading (saved it to another branch).

diff --git a/apps/workbench/app/views/jobs/_show_log.html.erb b/apps/workbench/app/views/jobs/_show_log.html.erb
index c1f1b33..7579f2b 100644
--- a/apps/workbench/app/views/jobs/_show_log.html.erb
+++ b/apps/workbench/app/views/jobs/_show_log.html.erb
@@ -77,18 +77,7 @@ $.ajax('<%=j url_for logcollection %>/<%=j logcollection.files[0][1] %>').
     $("#logloadspinner").detach();
   });
 <% else %>
-  <%# backlog = ""
-     Log.filter([['object_uuid', '=', @object.uuid],
-                  ['event_type', '=', 'stderr']]).order(["id", "asc"]).each do |l|
-        backlog += l.properties[:text]
-     end
-   %>
-
-  /* var backlog = "<%#=j backlog %>";
-    logViewer.filter();
-    addToLogViewer(logViewer, backlog.split("\n"));
-    logViewer.filter(makeFilter());  */
-
+  <%# Live log loading not implemented yet. %>
 <% end %>
 
 $(".toggle-filter").on("change", function() {
@@ -171,4 +160,8 @@ $("#sort-by-task").on("change", function() {
 
 </div>
 
+<% !if @object.log %>
+  This job is still running.  The job log will be available when the job is complete.
+<% end %>
+
 <%= image_tag 'ajax-loader.gif', id: "logloadspinner" %>

-----------------------------------------------------------------------


hooks/post-receive
--