class UsersController < ApplicationController
skip_around_filter :require_thread_api_token, only: :welcome
- skip_before_filter :check_user_agreements, only: :inactive
+ skip_before_filter :check_user_agreements, only: [:welcome, :inactive]
+ skip_before_filter :check_user_profile, only: [:welcome, :inactive, :profile]
skip_before_filter :find_object_by_uuid, only: [:welcome, :activity, :storage]
before_filter :ensure_current_user_is_admin, only: [:sudo, :unsetup, :setup]
+ def show
+ if params[:uuid] == current_user.uuid
+ respond_to do |f|
+ f.html do
+ redirect_to(params[:return_to] || project_path(params[:uuid]))
+ end
+ end
+ else
+ super
+ end
+ end
+
def welcome
if current_user
redirect_to (params[:return_to] || '/')
end
end
+ def profile
+ params[:offer_return_to] ||= params[:return_to]
+ end
+
def activity
@breadcrumb_page_name = nil
@users = User.limit(params[:limit] || 1000).all
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 = {}