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] || '/')
def activity
@breadcrumb_page_name = nil
- @users = User.limit(params[:limit] || 1000).all
+ @users = User.limit(params[:limit])
@user_activity = {}
@activity = {
logins: {},
1.month.ago.beginning_of_month,
Time.now.beginning_of_month]]
@spans.each do |span, threshold_start, threshold_end|
- @activity[:logins][span] = Log.
+ @activity[:logins][span] = Log.select(%w(uuid modified_by_user_uuid)).
filter([[:event_type, '=', 'login'],
[:object_kind, '=', 'arvados#user'],
[:created_at, '>=', threshold_start],
[:created_at, '<', threshold_end]])
- @activity[:jobs][span] = Job.
+ @activity[:jobs][span] = Job.select(%w(uuid modified_by_user_uuid)).
filter([[:created_at, '>=', threshold_start],
[:created_at, '<', threshold_end]])
- @activity[:pipeline_instances][span] = PipelineInstance.
+ @activity[:pipeline_instances][span] = PipelineInstance.select(%w(uuid modified_by_user_uuid)).
filter([[:created_at, '>=', threshold_start],
[:created_at, '<', threshold_end]])
@activity.each do |type, act|
def storage
@breadcrumb_page_name = nil
- @users = User.limit(params[:limit] || 1000).all
+ @users = User.limit(params[:limit])
@user_storage = {}
total_storage = {}
@log_date = {}
end
def home
- @showallalerts = false
@my_ssh_keys = AuthorizedKey.where(authorized_user_uuid: current_user.uuid)
@my_tag_links = {}
@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
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'],
+ ])
+
+ 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
@my_vm_logins = {}
end
end
+ def request_shell_access
+ logger.warn "request_access: #{params.inspect}"
+ params['request_url'] = request.url
+ RequestShellAccessReporter.send_request(current_user, params).deliver
+ end
+
protected
def find_current_links user