X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/e824ef364a6efd3c02bce159973f4098d794865c..67414a0a471a8046dac310c9a924ae6c0ce674c8:/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 27f13b7205..43a88955f0 100644 --- a/apps/workbench/app/controllers/users_controller.rb +++ b/apps/workbench/app/controllers/users_controller.rb @@ -35,7 +35,7 @@ class UsersController < ApplicationController def activity @breadcrumb_page_name = nil - @users = User.limit(params[:limit] || 1000).all + @users = User.limit(params[:limit]) @user_activity = {} @activity = { logins: {}, @@ -88,7 +88,7 @@ class UsersController < ApplicationController def storage @breadcrumb_page_name = nil - @users = User.limit(params[:limit] || 1000).all + @users = User.limit(params[:limit]) @user_storage = {} total_storage = {} @log_date = {} @@ -159,7 +159,7 @@ class UsersController < ApplicationController @persist_state[uuid] = 'cache' end - Link.limit(1000).filter([['head_uuid', 'in', collection_uuids], + Link.filter([['head_uuid', 'in', collection_uuids], ['link_class', 'in', ['tag', 'resources']]]). each do |link| case link.link_class @@ -236,16 +236,18 @@ class UsersController < ApplicationController 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'], - ['name', 'in', ['can_write', 'can_read']], - ]). - each do |perm_link| - repo_links << perm_link[:head_uuid] - end - @my_repositories = Repository.where(uuid: repo_links) + repo_links = Link. + filter([['head_uuid', 'is_a', 'arvados#repository'], + ['tail_uuid', '=', current_user.uuid], + ['link_class', '=', 'permission'], + ]) + @my_repositories = Repository.where uuid: repo_links.collect(&:head_uuid) + @repo_writable = {} + repo_links.each do |link| + if link.name.in? ['can_write', 'can_manage'] + @repo_writable[link.head_uuid] = true + end + end # virtual machines the current user can login into @my_vm_logins = {}