projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 3177-collection-choose-files
[arvados.git]
/
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 e869824be415d57cc0eddc8d1ee15fa50698eb04..5ddf93c2d35292555d538105c771e0ae1579b551 100644
(file)
--- a/
apps/workbench/app/controllers/collections_controller.rb
+++ b/
apps/workbench/app/controllers/collections_controller.rb
@@
-1,3
+1,5
@@
+require "arvados/keep"
+
class CollectionsController < ApplicationController
include ActionController::Live
class CollectionsController < ApplicationController
include ActionController::Live
@@
-298,7
+300,9
@@
class CollectionsController < ApplicationController
most_specific_error = [401]
token_list.each do |api_token|
begin
most_specific_error = [401]
token_list.each do |api_token|
begin
- using_specific_api_token(api_token) do
+ # We can't load the corresponding user, because the token may not
+ # be scoped for that.
+ using_specific_api_token(api_token, load_user: false) do
yield
return api_token
end
yield
return api_token
end