X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/6aac88a912ded276ed151501ac3977cfcc78600d..0561bd0c3c07257fd58ded6c7cfa5feeae97af57:/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 84d6cfd73c..2e3ced69a5 100644 --- a/apps/workbench/app/controllers/users_controller.rb +++ b/apps/workbench/app/controllers/users_controller.rb @@ -1,3 +1,7 @@ +# Copyright (C) The Arvados Authors. All rights reserved. +# +# SPDX-License-Identifier: AGPL-3.0 + class UsersController < ApplicationController skip_around_filter :require_thread_api_token, only: :welcome skip_before_filter :check_user_agreements, only: [:welcome, :inactive] @@ -102,6 +106,7 @@ class UsersController < ApplicationController filter([[:object_uuid, '=', u.uuid], [:event_type, '=', 'user-storage-report']]). order(:created_at => :desc). + with_count('none'). limit(1) storage_log.each do |log_entry| # We expect this block to only execute once since we specified limit(1) @@ -255,35 +260,9 @@ class UsersController < ApplicationController end end - def manage_account - # repositories current user can read / write - 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) - - @my_repositories = (Repository.where(uuid: repo_links.collect(&:head_uuid)) | - owned_repositories). - uniq { |repo| repo.uuid } - - - @repo_writable = {} - repo_links.each do |link| - if link.name.in? ['can_write', 'can_manage'] - @repo_writable[link.head_uuid] = link.name - end - end - - owned_repositories.each do |repo| - @repo_writable[repo.uuid] = 'can_manage' - 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| @@ -293,14 +272,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) - - @page = params["page"] - 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