[ARVADOS] updated: ff723f5f08e286df4c4c58a27a9db574ca604a6f

[Git user]

Summary of changes:
 apps/workbench/app/controllers/collections_controller.rb | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

       via  ff723f5f08e286df4c4c58a27a9db574ca604a6f (commit)
      from  6c51f11ab5affb4023762227ffb53a5be11a1003 (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 ff723f5f08e286df4c4c58a27a9db574ca604a6f
Author: Tom Clegg <tom at curoverse.com>
Date:   Wed Jun 21 15:31:58 2017 -0400

    8784: Link directly to keep-web when sharing collections.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curoverse.com>

diff --git a/apps/workbench/app/controllers/collections_controller.rb b/apps/workbench/app/controllers/collections_controller.rb
index b6112ac..3752bec 100644
--- a/apps/workbench/app/controllers/collections_controller.rb
+++ b/apps/workbench/app/controllers/collections_controller.rb
@@ -283,7 +283,12 @@ class CollectionsController < ApplicationController
   helper_method :download_link
 
   def download_link
-    collections_url + "/download/#{@object.uuid}/#{@search_sharing.first.api_token}/"
+    token = @search_sharing.first.api_token
+    if Rails.configuration.keep_web_url || Rails.configuration.keep_web_download_url
+      keep_web_url(@object.uuid, nil, {query_token: token})
+    else
+      collections_url + "/download/#{@object.uuid}/#{token}/"
+    end
   end
 
   def share

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


hooks/post-receive
--