[ARVADOS] updated: 6b13646940de2e5a62e600f2d7d82c72e3a4ae59

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/app/helpers/application_helper.rb             |  8 +++++---
 apps/workbench/app/views/application/_show_metadata.html.erb | 12 ++++++++++++
 docker/api/secret_token.rb.in                                |  5 +++++
 docker/build_tools/Makefile                                  |  3 ++-
 docker/config.yml.example                                    |  4 ++++
 docker/jobs/Dockerfile                                       |  2 ++
 6 files changed, 30 insertions(+), 4 deletions(-)

       via  6b13646940de2e5a62e600f2d7d82c72e3a4ae59 (commit)
       via  dfe74093596d3d7378e6f0d3e5f843f44d987074 (commit)
       via  06750c636edc78256a11aec392be21d63a0cceeb (commit)
       via  7ea7c6bc160097c24e2403d6f98f45a4369b4c7d (commit)
      from  ca77755f57b0478e3f4fbe3e6a6d7ade95012808 (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 6b13646940de2e5a62e600f2d7d82c72e3a4ae59
Merge: dfe7409 06750c6
Author: radhika <radhika at curoverse.com>
Date:   Wed Jun 4 15:53:17 2014 -0400

    Merge branch 'master' into 2871-preload-objects


commit dfe74093596d3d7378e6f0d3e5f843f44d987074
Author: radhika <radhika at curoverse.com>
Date:   Wed Jun 4 15:50:50 2014 -0400

    2871: metadata page updated to use some preloaded collections and links; not fully done yet.

diff --git a/apps/workbench/app/helpers/application_helper.rb b/apps/workbench/app/helpers/application_helper.rb
index b03b109..b50f223 100644
--- a/apps/workbench/app/helpers/application_helper.rb
+++ b/apps/workbench/app/helpers/application_helper.rb
@@ -100,13 +100,15 @@ module ApplicationHelper
           link_name = "#{resource_class.to_s}: #{link_name}"
         end
         if !opts[:no_tags] and resource_class == Collection
-          Link.where(head_uuid: link_uuid, link_class: ["tag", "identifier"]).each do |tag|
-            link_name += ' <span class="label label-info">' + html_escape(tag.name) + '</span>'
+          links_for_object(link_uuid).each do |tag|
+            if tag.link_class.in? ["tag", "identifier"]
+              link_name += ' <span class="label label-info">' + html_escape(tag.name) + '</span>'
+            end
           end
         end
         if opts[:thumbnail] and resource_class == Collection
           # add an image thumbnail if the collection consists of a single image file.
-          Collection.where(uuid: link_uuid).each do |c|
+          collections_for_object(link_uuid).each do |c|
             if c.files.length == 1 and CollectionsHelper::is_image c.files.first[1]
               link_name += " "
               link_name += image_tag "#{url_for c}/#{CollectionsHelper::file_path c.files.first}", style: "height: 4em; width: auto"
diff --git a/apps/workbench/app/views/application/_show_metadata.html.erb b/apps/workbench/app/views/application/_show_metadata.html.erb
index 551806f..933f90b 100644
--- a/apps/workbench/app/views/application/_show_metadata.html.erb
+++ b/apps/workbench/app/views/application/_show_metadata.html.erb
@@ -1,6 +1,18 @@
 <% outgoing = Link.where(tail_uuid: @object.uuid) %>
 <% incoming = Link.where(head_uuid: @object.uuid) %>
 
+<%
+  preload_uuids = []
+  preload_head_uuids = []
+  outgoing.results.each do |link|
+    preload_uuids << link.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
+%>
+
 <h3>Metadata about this object</h3>
 <% if outgoing.items_available > 0 %>
 <table class="table topalign">

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


hooks/post-receive
--