[ARVADOS] updated: 30228998e995720e4c2e1a3f0b52be231d9fbb9a

[git at public.curoverse.com]

Summary of changes:
 .../pipeline_instances/_show_components.html.erb   | 46 ++++++++++------------
 1 file changed, 21 insertions(+), 25 deletions(-)

       via  30228998e995720e4c2e1a3f0b52be231d9fbb9a (commit)
      from  facb17a2885e6b6d3e998e15862a3c6e970e8cf1 (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 30228998e995720e4c2e1a3f0b52be231d9fbb9a
Author: radhika <radhika at curoverse.com>
Date:   Tue May 27 14:59:55 2014 -0400

    2756: update the ui to show job progress, and links in one column

diff --git a/apps/workbench/app/views/pipeline_instances/_show_components.html.erb b/apps/workbench/app/views/pipeline_instances/_show_components.html.erb
index 8ced326..ddbda58 100644
--- a/apps/workbench/app/views/pipeline_instances/_show_components.html.erb
+++ b/apps/workbench/app/views/pipeline_instances/_show_components.html.erb
@@ -16,7 +16,6 @@
   <% end %>
 <% end %>
 
-<% pipeline_jobs = [] %>
 <% pipeline_job_uuids = [] %>
 
 <% if !@object.state.in? ['New', 'Ready', 'Paused'] %>
@@ -24,10 +23,9 @@
   <colgroup>
     <col style="width: 15%" />
     <col style="width: 20%" />
-    <col style="width: 15%" />
     <col style="width: 12%" />
     <col style="width: 12%" />
-    <col style="width: 26%" />
+    <col style="width: 45%" />
   </colgroup>
   <thead>
     <tr>
@@ -36,9 +34,7 @@
       </th><th>
         script, version
       </th><th>
-        Job
-      </th><th>
-        progress
+        job
         <%# format:'js' here helps browsers avoid using the cached js
         content in html context (e.g., duplicate tab -> see
         javascript) %>
@@ -52,7 +48,6 @@
   <tbody>
     <% render_pipeline_jobs.each do |pj| %>
       <% if pj[:job].andand[:uuid]
-           pipeline_jobs << pj[:job]
            pipeline_job_uuids << pj[:job][:uuid]
          end %>
     <tr>
@@ -62,11 +57,26 @@
         <%= pj[:script] %>
         <br /><span class="deemphasize"><%= pj[:script_version] %></span>
       </td><td>
-        <% if pj[:job].andand[:uuid] %>
-          <%= link_to("..."+pj[:job][:uuid].last(15), job_url(id: pj[:job][:uuid])) %>
-        <% end %>
-      </td><td>
         <%= pj[:progress_bar] %>
+        <% if @object.state == 'Complete' || @object.state == 'Failed' %>
+          <% if pj[:job].andand[:uuid] %>
+            <span class="deemphasize">
+            <%= link_to("..."+pj[:job][:uuid].last(15), job_url(id: pj[:job][:uuid])) %>
+            </span>
+
+            <% current_job = Job.find(pj[:job][:uuid]) rescue nil %>
+            <% if current_job.andand[:log] %>
+              <% fixup = /([a-f0-9]{32}\+\d+)(\+?.*)/.match(current_job[:log])%>
+              <% Collection.limit(1).where(uuid: fixup[1]).each do |c| %>
+                <% c.files.each do |file| %>
+                  <br/><span class="deemphasize">
+                  <a href="<%= collection_path(current_job[:log]) %>/<%= file[1] %>?disposition=inline&size=<%= file[2] %>">log</a>
+                  </span>
+                <% end %>
+              <% end %>
+            <% end %>
+          <% end %>
+        <% end %>
       </td><td>
         <%= render(partial: 'job_status_label',
                                locals: { :j => pj[:job] }) %>
@@ -107,20 +117,6 @@ setInterval(function(){$('a.refresh').click()}, 15000);
       </div>
       <div class="arv-log-event-listener arv-log-event-handler-append-logs" id="pipeline_event_log_div" data-object-uuids="<%=pipeline_job_uuids.join(" ")%>"/>
     <% end %>
-  <% else %>      <%# Not running. Must be done. %>
-    <h4>Log for pipeline</h4>
-    <div id="pipeline_event_log_history_div">
-    <% pipeline_jobs.each do |j| %>
-      <% if j[:log] %>
-        <% fixup = /([a-f0-9]{32}\+\d+)(\+?.*)/.match(j[:log])%>
-        <% Collection.limit(1).where(uuid: fixup[1]).each do |c| %>
-          <% c.files.each do |file| %>
-            <a href="<%= collection_path(j[:log]) %>/<%= file[1] %>?disposition=inline&size=<%= file[2] %>"><%=j[:uuid]%> Log</a><br/>
-          <% end %>
-        <% end %>
-      <% end %>
-    <% end %>
-    </div>
   <% end %>
 
 <% else %>    <%# State new or ready or paused %>

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


hooks/post-receive
--