From ff723f5f08e286df4c4c58a27a9db574ca604a6f Mon Sep 17 00:00:00 2001 From: Tom Clegg Date: Wed, 21 Jun 2017 15:31:58 -0400 Subject: [PATCH] 8784: Link directly to keep-web when sharing collections. Arvados-DCO-1.1-Signed-off-by: Tom Clegg --- apps/workbench/app/controllers/collections_controller.rb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/apps/workbench/app/controllers/collections_controller.rb b/apps/workbench/app/controllers/collections_controller.rb index b6112ac96b..3752bec7be 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 -- 2.30.2