[ARVADOS] updated: 570201300b90a676b4bc49ea02627d1057386615

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/app/assets/stylesheets/application.css.scss   | 3 +++
 apps/workbench/app/helpers/application_helper.rb             | 6 +++++-
 apps/workbench/app/views/application/_show_metadata.html.erb | 2 +-
 apps/workbench/app/views/application/_svg_div.html.erb       | 2 +-
 apps/workbench/test/integration/pipeline_instances_test.rb   | 4 ++++
 5 files changed, 14 insertions(+), 3 deletions(-)

       via  570201300b90a676b4bc49ea02627d1057386615 (commit)
       via  3674d731b92e091811872eef0b909171d3574614 (commit)
       via  03812184bfa1ab7f17960ef48ff30798333bdd54 (commit)
       via  30d63b582ed093d235ae4a9efdeda5de1d4e2f24 (commit)
       via  37301d86406cc4991c6f149f00a6a0846d1808af (commit)
       via  fd1e12105ef7efb5e2642c8e20f032f5b15cd974 (commit)
       via  3ed7de1ce58d88b95cd47dbb4c53811a8f13a91f (commit)
       via  263c5c8d78109908fda64b6b327904f1d93e5c52 (commit)
       via  3e3389504c6841e160ac086328693001261e016d (commit)
       via  b2da714edbcb2fc203d2cbc83a940ab776be73d0 (commit)
       via  20c594c3c683a492132c0fc105241689ee116c10 (commit)
      from  6b13646940de2e5a62e600f2d7d82c72e3a4ae59 (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 570201300b90a676b4bc49ea02627d1057386615
Author: radhika <radhika at curoverse.com>
Date:   Wed Jun 4 17:13:15 2014 -0400

    2871: metadata tab using preloaded objects. wow, i can't believe how many api calls are cut down with this :)

diff --git a/apps/workbench/app/helpers/application_helper.rb b/apps/workbench/app/helpers/application_helper.rb
index b50f223..bdfa78b 100644
--- a/apps/workbench/app/helpers/application_helper.rb
+++ b/apps/workbench/app/helpers/application_helper.rb
@@ -89,7 +89,11 @@ module ApplicationHelper
             link_name = attrvalue.friendly_link_name
           else
             begin
-              link_name = resource_class.find(link_uuid).friendly_link_name
+              link_name = ''
+              collections_for_object(link_uuid).each do |c|
+                link_name = c.friendly_link_name
+                break
+              end
             rescue RuntimeError
               # If that lookup failed, the link will too. So don't make one.
               return attrvalue

commit 3674d731b92e091811872eef0b909171d3574614
Author: radhika <radhika at curoverse.com>
Date:   Wed Jun 4 17:01:03 2014 -0400

    2871: add link head_uuids to the list of to be preloaded uuids

diff --git a/apps/workbench/app/views/application/_show_metadata.html.erb b/apps/workbench/app/views/application/_show_metadata.html.erb
index 933f90b..77f2dda 100644
--- a/apps/workbench/app/views/application/_show_metadata.html.erb
+++ b/apps/workbench/app/views/application/_show_metadata.html.erb
@@ -6,9 +6,9 @@
   preload_head_uuids = []
   outgoing.results.each do |link|
     preload_uuids << link.uuid
+    preload_uuids << link.head_uuid
     preload_head_uuids << link.head_uuid
   end
-  preload_uuids << preload_head_uuids
   preload_collections_for_objects preload_uuids
   preload_links_for_objects preload_head_uuids
 %>

commit 03812184bfa1ab7f17960ef48ff30798333bdd54
Merge: 6b13646 30d63b5
Author: radhika <radhika at curoverse.com>
Date:   Wed Jun 4 16:17:06 2014 -0400

    Merge branch 'master' into 2871-preload-objects


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


hooks/post-receive
--