X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/03e570095885982d23e234bce8e1c068314b63af..2d4198a095e193102daa2710c6b2baba7be7c9ce:/services/api/app/controllers/arvados/v1/virtual_machines_controller.rb diff --git a/services/api/app/controllers/arvados/v1/virtual_machines_controller.rb b/services/api/app/controllers/arvados/v1/virtual_machines_controller.rb index e176348121..519178b0bb 100644 --- a/services/api/app/controllers/arvados/v1/virtual_machines_controller.rb +++ b/services/api/app/controllers/arvados/v1/virtual_machines_controller.rb @@ -24,11 +24,11 @@ class Arvados::V1::VirtualMachinesController < ApplicationController vm.login_permissions.each do |perm| user_uuid = perm.tail_uuid @users[user_uuid].andand.authorized_keys.andand.each do |ak| - username = perm.properties.andand['username'] - if username + unless perm.properties['username'].blank? @response << { - username: username, + username: perm.properties['username'], hostname: vm.hostname, + groups: (perm.properties["groups"].to_a rescue []), public_key: ak.public_key, user_uuid: user_uuid, virtual_machine_uuid: vm.uuid, @@ -38,6 +38,6 @@ class Arvados::V1::VirtualMachinesController < ApplicationController end end end - render json: { kind: "arvados#HashList", items: @response } + send_json kind: "arvados#HashList", items: @response end end