[ARVADOS] updated: f01af635017a4988e07252f81072d0d37a889298

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/app/helpers/application_helper.rb                  | 7 ++++++-
 .../views/pipeline_instances/_show_components_running.html.erb    | 8 ++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

       via  f01af635017a4988e07252f81072d0d37a889298 (commit)
      from  cd1f6c0fd2f9a91b88659b90a6fd9faee576a557 (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 f01af635017a4988e07252f81072d0d37a889298
Author: Radhika Chippada <radhika at curoverse.com>
Date:   Tue Apr 7 14:05:43 2015 -0400

    5365: preload jobs during pipeline display to improve performance.

diff --git a/apps/workbench/app/helpers/application_helper.rb b/apps/workbench/app/helpers/application_helper.rb
index 147e5a6..5fc541c 100644
--- a/apps/workbench/app/helpers/application_helper.rb
+++ b/apps/workbench/app/helpers/application_helper.rb
@@ -183,7 +183,12 @@ module ApplicationHelper
       return link_text_if_not_readable
     end
 
-    readable = resource_class.find?(attrvalue)
+    if resource_class.andand.to_s == 'Collection'
+      readable = resource_class.find?(attrvalue)
+    else
+      readable = object_for_dataclass(resource_class, attrvalue)
+    end
+
     if readable
       if use_friendly_name
         link_to_if_arvados_object attrvalue, friendly_name: true
diff --git a/apps/workbench/app/views/pipeline_instances/_show_components_running.html.erb b/apps/workbench/app/views/pipeline_instances/_show_components_running.html.erb
index d99ac23..e112a05 100644
--- a/apps/workbench/app/views/pipeline_instances/_show_components_running.html.erb
+++ b/apps/workbench/app/views/pipeline_instances/_show_components_running.html.erb
@@ -80,6 +80,14 @@
 </p>
 
 <%# Components %>
+          
+<%
+  job_uuids = pipeline_jobs.collect {|j| j[:job][:uuid]}.compact
+  if job_uuids.any?
+    resource_class = resource_class_for_uuid(job_uuids.first, friendly_name: true)
+    preload_objects_for_dataclass resource_class, job_uuids
+  end
+%>
 
 <% pipeline_jobs.each_with_index do |pj, i| %>
   <%= render partial: 'running_component', locals: {tasks: tasks, pj: pj, i: i, expanded: false} %>

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


hooks/post-receive
--