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
/
nodes_controller.rb
diff --git
a/services/api/app/controllers/arvados/v1/nodes_controller.rb
b/services/api/app/controllers/arvados/v1/nodes_controller.rb
index b308c183291968d9ed2aa609216dc574d0b92efc..2f6c6504b7ddfed584385cdfb788c9e0198162d0 100644
(file)
--- a/
services/api/app/controllers/arvados/v1/nodes_controller.rb
+++ b/
services/api/app/controllers/arvados/v1/nodes_controller.rb
@@
-6,8
+6,8
@@
class Arvados::V1::NodesController < ApplicationController
include DbCurrentTime
def update
include DbCurrentTime
def update
- if resource_attrs[:job_uuid]
- @object.job_readable = readable_job_uuids(
resource_attrs[:job_uuid
]).any?
+ if resource_attrs[:job_uuid]
.is_a? String
+ @object.job_readable = readable_job_uuids(
[resource_attrs[:job_uuid]
]).any?
end
super
end
end
super
end
@@
-57,7
+57,7
@@
class Arvados::V1::NodesController < ApplicationController
protected
protected
- def readable_job_uuids(
*
uuids)
+ def readable_job_uuids(uuids)
Job.readable_by(*@read_users).select(:uuid).where(uuid: uuids).map(&:uuid)
end
end
Job.readable_by(*@read_users).select(:uuid).where(uuid: uuids).map(&:uuid)
end
end