[ARVADOS] updated: b64b0a4082eeba5d17705dca3bedf53b99ded617

[git at public.curoverse.com]

Summary of changes:
 .../app/assets/javascripts/pipeline_instances.js          | 15 +--------------
 .../views/pipeline_instances/_show_components.html.erb    |  6 ++++--
 2 files changed, 5 insertions(+), 16 deletions(-)

       via  b64b0a4082eeba5d17705dca3bedf53b99ded617 (commit)
      from  4d1e1b22d470d2fec9078c64c058c69850e440d6 (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 b64b0a4082eeba5d17705dca3bedf53b99ded617
Author: radhika <radhika at curoverse.com>
Date:   Wed May 21 14:42:49 2014 -0400

    2756: show log for this pipelines jobs.

diff --git a/apps/workbench/app/assets/javascripts/pipeline_instances.js b/apps/workbench/app/assets/javascripts/pipeline_instances.js
index 4678022..4a95bac 100644
--- a/apps/workbench/app/assets/javascripts/pipeline_instances.js
+++ b/apps/workbench/app/assets/javascripts/pipeline_instances.js
@@ -54,20 +54,7 @@
     $(document).on('arv-log-event', '.arv-log-event-handler-append-logs', function(event, eventData){
       parsedData = JSON.parse(eventData);
       summary = parsedData.summary;
-      properties = parsedData.properties;
-      updatedProperties = null;
-      if (properties !== null) {
-        new_attributes = properties.new_attributes;
-        if (new_attributes !== null) {
-          updatedProperties = JSON.stringify(properties.new_attributes);
-        }
-      }
-
-      if (updatedProperties !== null) {
-        $(this).append(updatedProperties + "<br/><br/>");
-      } else {
-        $(this).append(summary + "<br/><br/>");
-      }
+      $(this).append(summary + "<br/><br/>");
     });
 
 })();
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 9a4218d..f0037bb 100644
--- a/apps/workbench/app/views/pipeline_instances/_show_components.html.erb
+++ b/apps/workbench/app/views/pipeline_instances/_show_components.html.erb
@@ -91,8 +91,10 @@ setInterval(function(){$('a.refresh').click()}, 15000);
 <% end %>
 
   <% if !@object.state.in? ['Complete', 'Failed'] %>
-    <h4>Log for pipeline</h4>
-    <div class="arv-log-event-listener arv-log-event-handler-append-logs" id="pipeline_event_log_div" data-object-uuids="<%=pipeline_job_uuids.join(" ")%>"/>
+    <% if !pipeline_job_uuids.empty? %>
+      <h4>Log for pipeline</h4>
+      <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 %>
   <% end %>
 <% end %>
 

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


hooks/post-receive
--