Merge branch 'master' into 4138-node-manager-google-cloud

[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 f2a04b3b29e79efdcd417d68a60e7ee40f921f06..efee982e74bcf7d62a8baac4561ee0da399dbd3e 100644 (file)
--- a/services/api/app/controllers/arvados/v1/nodes_controller.rb
+++ b/services/api/app/controllers/arvados/v1/nodes_controller.rb
@@ -11,7 +11,7 @@ class Arvados::V1::NodesController < ApplicationController
   end
 
   def self._ping_requires_parameters
-    { ping_secret: true }
+    { ping_secret: {required: true} }
   end
 
   def ping
@@ -38,17 +38,16 @@ class Arvados::V1::NodesController < ApplicationController
   end
 
   def find_objects_for_index
-    if current_user.andand.is_admin || !current_user.andand.is_active
-      super
-    else
+    if !current_user.andand.is_admin && current_user.andand.is_active
       # active non-admin users can list nodes that are (or were
       # recently) working
       @objects = model_class.where('last_ping_at >= ?', Time.now - 1.hours)
     end
-    assigned_nodes = @objects.select(&:job_uuid)
-    assoc_jobs = readable_job_uuids(*assigned_nodes.map(&:job_uuid))
-    assigned_nodes.each do |node|
-      node.job_readable = assoc_jobs.include?(node.job_uuid)
+    super
+    job_uuids = @objects.map { |n| n[:job_uuid] }.compact
+    assoc_jobs = readable_job_uuids(job_uuids)
+    @objects.each do |node|
+      node.job_readable = assoc_jobs.include?(node[:job_uuid])
     end
   end