From: Tom Clegg <tom@curoverse.com>
Date: Wed, 21 Jun 2017 19:31:58 +0000 (-0400)
Subject: 8784: Link directly to keep-web when sharing collections.
X-Git-Tag: 1.1.0~155^2~2
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/ff723f5f08e286df4c4c58a27a9db574ca604a6f

8784: Link directly to keep-web when sharing collections.

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curoverse.com>
---

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