[ARVADOS] updated: 02840ce904bef5542090fda327c072cdd05c32b3

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/app/helpers/application_helper.rb           |  2 +-
 .../views/pipeline_instances/_running_component.html.erb   |  5 +++--
 .../pipeline_instances/_show_components_editable.html.erb  |  2 +-
 .../pipeline_instances/_show_components_running.html.erb   | 11 ++++++-----
 services/arv-git-httpd/auth_handler.go                     |  3 ++-
 services/arv-git-httpd/main.go                             |  1 +
 services/arv-git-httpd/server_test.go                      | 14 +++++++++++---
 7 files changed, 25 insertions(+), 13 deletions(-)

       via  02840ce904bef5542090fda327c072cdd05c32b3 (commit)
       via  41bd04e7f25b0b5882e971ff7104e3f17c19bf5b (commit)
       via  ff4b954070f67379e336f15a424b2f9afb35e84f (commit)
       via  f9382ce9eb339c8595b83823960481b3cbe79584 (commit)
       via  6ab9f3292ddb980192e3af1090147c32af098d95 (commit)
      from  2af59ce37d2332db14e880aff0ba8e38fdc4781a (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 02840ce904bef5542090fda327c072cdd05c32b3
Author: Radhika Chippada <radhika at curoverse.com>
Date:   Thu Apr 9 11:54:59 2015 -0400

    5365: do not link to docker_image_locator if not readable; also preload these.

diff --git a/apps/workbench/app/helpers/application_helper.rb b/apps/workbench/app/helpers/application_helper.rb
index 0dee527..a445c90 100644
--- a/apps/workbench/app/helpers/application_helper.rb
+++ b/apps/workbench/app/helpers/application_helper.rb
@@ -298,7 +298,7 @@ module ApplicationHelper
     end
 
     if not object.andand.attribute_editable?(attr)
-      return link_to_arvados_object_if_readable(attrvalue, attrvalue, attrvalue, false)
+      return link_to_arvados_object_if_readable(attrvalue, attrvalue, attrvalue, true)
     end
 
     if dataclass
diff --git a/apps/workbench/app/views/pipeline_instances/_running_component.html.erb b/apps/workbench/app/views/pipeline_instances/_running_component.html.erb
index d0959f2..7c528b0 100644
--- a/apps/workbench/app/views/pipeline_instances/_running_component.html.erb
+++ b/apps/workbench/app/views/pipeline_instances/_running_component.html.erb
@@ -124,7 +124,8 @@
                     docker_image_locator:
                   </td>
                   <td>
-                    <%= link_to_if_arvados_object current_component[:docker_image_locator], friendly_name: true %>
+                    <%= link_to_arvados_object_if_readable(current_component[:docker_image_locator],
+                      current_component[:docker_image_locator], current_component[:docker_image_locator], true) %>
                   </td>
                 </tr>
               <% else %>
@@ -150,7 +151,7 @@
                     <% if k == :uuid %>
                       <%= link_to_arvados_object_if_readable(current_component[k], current_component[k], current_component[k], false) %>
                     <% elsif k.to_s.end_with? 'uuid' %>
-                      <%= link_to_if_arvados_object current_component[k], friendly_name: true %>
+                      <%= link_to_arvados_object_if_readable(current_component[k], current_component[k], current_component[k], true) %>
                     <% elsif k.to_s.end_with? '_at' %>
                       <%= render_localized_date(current_component[k]) %>
                     <% else %>
diff --git a/apps/workbench/app/views/pipeline_instances/_show_components_editable.html.erb b/apps/workbench/app/views/pipeline_instances/_show_components_editable.html.erb
index 50b2c9e..4277909 100644
--- a/apps/workbench/app/views/pipeline_instances/_show_components_editable.html.erb
+++ b/apps/workbench/app/views/pipeline_instances/_show_components_editable.html.erb
@@ -4,7 +4,7 @@
   @object.components.each do |k, component|
     next if !component
     component[:script_parameters].andand.each do |p, tv|
-      if tv[:value] and tv[:dataclass].andand.eql?('Collection')
+      if tv.is_a? Hash and !tv[:value].nil? and tv[:dataclass].andand.eql?('Collection')
         if CollectionsHelper.match(tv[:value])
           input_pdhs << tv[:value]
         else
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 dcbdb1d..6fa409a 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
@@ -88,11 +88,12 @@
     preload_objects_for_dataclass resource_class, job_uuids
   end
 
-  job_outputs = pipeline_jobs.collect {|j| j[:job][:output]}.compact
-  job_output_pdhs = job_outputs.select {|x| !(m = CollectionsHelper.match(x)).nil?}.compact
-  job_output_uuids = job_outputs - job_output_pdhs
-  preload_collections_for_objects job_output_uuids if job_output_uuids.any?
-  preload_for_pdhs job_output_pdhs if job_output_pdhs.any?
+  job_collections = pipeline_jobs.collect {|j| j[:job][:output]}.compact
+  job_collections.concat pipeline_jobs.collect {|j| j[:job][:docker_image_locator]}.uniq.compact
+  job_collections_pdhs = job_collections.select {|x| !(m = CollectionsHelper.match(x)).nil?}.uniq.compact
+  job_collections_uuids = job_collections - job_collections_pdhs
+  preload_collections_for_objects job_collections_uuids if job_collections_uuids.any?
+  preload_for_pdhs job_collections_pdhs if job_collections_pdhs.any?
 %>
 
 <% pipeline_jobs.each_with_index do |pj, i| %>

commit 41bd04e7f25b0b5882e971ff7104e3f17c19bf5b
Merge: 2af59ce ff4b954
Author: Radhika Chippada <radhika at curoverse.com>
Date:   Thu Apr 9 10:13:11 2015 -0400

    Merge branch 'master' into 5365-not-link-unreadables


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


hooks/post-receive
--