if params[:uuid] == current_user.uuid
respond_to do |f|
f.html do
- redirect_to(params[:return_to] || project_path(params[:uuid]))
+ if request.url.include?("/users/#{current_user.uuid}")
+ super
+ else
+ redirect_to(params[:return_to] || project_path(params[:uuid]))
+ end
end
end
else
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)
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
end
if params[:groups]
new_groups = params[:groups].split(',').map(&:strip).select{|i| !i.empty?}
- if new_groups != vm_link[:properties][:groups]
+ if vm_link and new_groups != vm_link[:properties][:groups]
vm_login_link = Link.where(uuid: vm_link[:uuid])
if vm_login_link.items_available > 0
link = vm_login_link.results.first
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 }
-
+ def repositories
+ # all repositories accessible by current user
+ all_repositories = Hash[Repository.all.order('name asc').collect {|repo| [repo.uuid, repo]}]
+ @my_repositories = [] # we want them ordered as owned and the rest
@repo_writable = {}
- repo_links.each do |link|
- if link.name.in? ['can_write', 'can_manage']
- @repo_writable[link.head_uuid] = link.name
+
+ # owned repos
+ all_repositories.each do |_, repo|
+ if repo.owner_uuid == current_user.uuid
+ @repo_writable[repo.uuid] = 'can_write'
+ @my_repositories << repo
end
end
- owned_repositories.each do |repo|
- @repo_writable[repo.uuid] = 'can_manage'
+ # rest of the repos
+ handled = @my_repositories.map(&:uuid)
+ all_repositories.each do |_, repo|
+ @my_repositories << repo if !repo.uuid.in?(handled)
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|
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