X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/e8db6685b64c6853eb3c5d3ee27ba58168c3c8e8..b04638275cff9b393e1bc04136d44f361b999cf8:/apps/workbench/app/controllers/users_controller.rb diff --git a/apps/workbench/app/controllers/users_controller.rb b/apps/workbench/app/controllers/users_controller.rb index 2f513655b6..d2fcbbb94c 100644 --- a/apps/workbench/app/controllers/users_controller.rb +++ b/apps/workbench/app/controllers/users_controller.rb @@ -208,9 +208,6 @@ class UsersController < ApplicationController if params['openid_prefix'] && params['openid_prefix'].size>0 setup_params[:openid_prefix] = params['openid_prefix'] end - if params['repo_name'] && params['repo_name'].size>0 - setup_params[:repo_name] = params['repo_name'] - end if params['vm_uuid'] && params['vm_uuid'].size>0 setup_params[:vm_uuid] = params['vm_uuid'] end @@ -258,15 +255,14 @@ class UsersController < ApplicationController end end - def manage_account - # repositories current user can read / write + def repositories repo_links = Link. filter([['head_uuid', 'is_a', 'arvados#repository'], ['tail_uuid', '=', current_user.uuid], ['link_class', '=', 'permission'], ]) - owned_repositories = Repository.where(owner_uuid: current_user.uuid) + owned_repositories = Repository.where(owner_uuid: @object.uuid) @my_repositories = (Repository.where(uuid: repo_links.collect(&:head_uuid)) | owned_repositories). @@ -283,10 +279,11 @@ class UsersController < ApplicationController owned_repositories.each do |repo| @repo_writable[repo.uuid] = 'can_manage' end + end - # virtual machines the current user can login into + def virtual_machines @my_vm_logins = {} - Link.where(tail_uuid: current_user.uuid, + Link.where(tail_uuid: @object.uuid, link_class: 'permission', name: 'can_login'). each do |perm_link| @@ -296,13 +293,10 @@ class UsersController < ApplicationController end end @my_virtual_machines = VirtualMachine.where(uuid: @my_vm_logins.keys) + end - # current user's ssh keys - @my_ssh_keys = AuthorizedKey.where(key_type: 'SSH', owner_uuid: current_user.uuid) - - respond_to do |f| - f.html { render template: 'users/manage_account' } - end + def ssh_keys + @my_ssh_keys = AuthorizedKey.where(key_type: 'SSH', owner_uuid: @object.uuid) end def add_ssh_key_popup