X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/fde712e92ad33e03dfd79f5fca99d2005cdd0795..dc00995b1843cd1decebffe1493e55a16c3c0df9:/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 d4b917b4dc..f6d571157d 100644
--- a/apps/workbench/app/controllers/users_controller.rb
+++ b/apps/workbench/app/controllers/users_controller.rb
@@ -1,17 +1,41 @@
 class UsersController < ApplicationController
-  skip_before_filter :find_object_by_uuid, :only => [:welcome, :activity, :storage]
+  skip_around_filter :require_thread_api_token, only: :welcome
+  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
-      params[:action] = 'home'
-      home
+      redirect_to (params[:return_to] || '/')
     end
   end
 
+  def inactive
+    if current_user.andand.is_invited
+      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
+    @users = User.limit(params[:limit])
     @user_activity = {}
     @activity = {
       logins: {},
@@ -28,15 +52,15 @@ class UsersController < ApplicationController
                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|
@@ -64,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 = {}
@@ -115,7 +139,6 @@ class UsersController < ApplicationController
   end
 
   def home
-    @showallalerts = false
     @my_ssh_keys = AuthorizedKey.where(authorized_user_uuid: current_user.uuid)
     @my_tag_links = {}
 
@@ -135,7 +158,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
@@ -212,16 +235,29 @@ 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'],
+             ])
+
+    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 = {}
@@ -277,35 +313,10 @@ class UsersController < ApplicationController
     end
   end
 
-  def update_profile
-    user_prefs = User.limit(1).where(uuid: current_user.uuid).first.prefs
-
-    profile_keys = []
-    profile_config = Rails.configuration.user_profile_form_fields
-    profile_config.andand.each do |entry|
-      profile_keys << entry['key']
-    end
-
-    updated_profile = {}
-    params.andand.each do |param|
-      if profile_keys.include? param[0]
-        if param[1].andand.size>0
-          updated_profile['profile_'+param[0]] = param[1]
-        end
-      end
-    end
-
-    # Inform server to send mail if this is the first time profile is being created and notification is configured
-    profile_notification_address = Rails.configuration.user_profile_notification_address
-    current_user_profile = user_prefs[:profile] if user_prefs
-    if !current_user_profile && profile_notification_address
-      updated_profile[:send_profile_notification_email] = profile_notification_address
-    end
-
-    current_user.update_profile updated_profile
-    respond_to do |format|
-      format.js {render inline: "location.reload();"}
-    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