end
@object.ping(ping_data)
if @object.info['ping_secret'] == params[:ping_secret]
- render json: @object.as_api_response(:superuser)
+ send_json @object.as_api_response(:superuser)
else
raise "Invalid ping_secret after ping"
end
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