X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/9e9506f9acce0d11a82f7abcea31680761d6427b..4cfb296612f7b483b56c36f119ca175def706d2f:/apps/workbench/app/controllers/collections_controller.rb diff --git a/apps/workbench/app/controllers/collections_controller.rb b/apps/workbench/app/controllers/collections_controller.rb index 41b4771e4e..f87579e3b2 100644 --- a/apps/workbench/app/controllers/collections_controller.rb +++ b/apps/workbench/app/controllers/collections_controller.rb @@ -145,7 +145,7 @@ class CollectionsController < ApplicationController end if usable_token.nil? return # Response already rendered. - elsif params[:file].nil? or not file_in_collection?(coll, params[:file]) + elsif params[:file].nil? or not coll.manifest.has_file?(params[:file]) return render_not_found end opts = params.merge(arvados_api_token: usable_token) @@ -277,13 +277,6 @@ class CollectionsController < ApplicationController return nil end - def file_in_collection?(collection, filename) - target = CollectionsHelper.file_path(File.split(filename)) - collection.manifest.each_file.any? do |file_spec| - CollectionsHelper.file_path(file_spec) == target - end - end - def file_enumerator(opts) FileStreamer.new opts end