projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
11308: Merge branch 'master' into 11308-python3
[arvados.git]
/
services
/
api
/
app
/
controllers
/
arvados
/
v1
/
user_agreements_controller.rb
diff --git
a/services/api/app/controllers/arvados/v1/user_agreements_controller.rb
b/services/api/app/controllers/arvados/v1/user_agreements_controller.rb
index 32adde9507554ee9195bbc812b51cc1d86d753ba..f23cd98c354824b4998373183b2cbaa17b08a715 100644
(file)
--- a/
services/api/app/controllers/arvados/v1/user_agreements_controller.rb
+++ b/
services/api/app/controllers/arvados/v1/user_agreements_controller.rb
@@
-17,7
+17,6
@@
class Arvados::V1::UserAgreementsController < ApplicationController
# use this installation.
@objects = []
else
# use this installation.
@objects = []
else
- current_user_uuid = current_user.uuid
act_as_system_user do
uuids = Link.where("owner_uuid = ? and link_class = ? and name = ? and tail_uuid = ? and head_uuid like ?",
system_user_uuid,
act_as_system_user do
uuids = Link.where("owner_uuid = ? and link_class = ? and name = ? and tail_uuid = ? and head_uuid like ?",
system_user_uuid,
@@
-25,7
+24,7
@@
class Arvados::V1::UserAgreementsController < ApplicationController
'require',
system_user_uuid,
Collection.uuid_like_pattern).
'require',
system_user_uuid,
Collection.uuid_like_pattern).
- collect
&:head_uuid
+ collect
(&:head_uuid)
@objects = Collection.where('uuid in (?)', uuids)
end
end
@objects = Collection.where('uuid in (?)', uuids)
end
end