3114: Merge branch 'master' into 3114-copy-to-project

[arvados.git] / 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 5746520d78afde7dc518d33652efda4fb9d1745e..189f295f8fe097c2a2a17e8a5f41342ed254eef0 100644 (file)
--- a/apps/workbench/app/controllers/users_controller.rb
+++ b/apps/workbench/app/controllers/users_controller.rb
@@ -1,14 +1,34 @@
 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
+      redirect_to project_path(params[:uuid])
+    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
@@ -111,7 +131,7 @@ class UsersController < ApplicationController
                                       owner_uuid: @object.uuid
                                     }
                                   })
-    redirect_to root_url(api_token: resp[:api_token], skip_profile: true)
+    redirect_to root_url(api_token: resp[:api_token])
   end
 
   def home
@@ -277,48 +297,6 @@ class UsersController < ApplicationController
     end
   end
 
-  def manage_profile
-    @profile_config = Rails.configuration.user_profile_form_fields
-    @this_user = User.limit(1).where(uuid: current_user.uuid).first
-    user_prefs = @this_user.prefs
-    @current_user_profile = user_prefs[:profile] if user_prefs
-
-    respond_to do |f|
-      f.html { render template: 'users/profile' }
-    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
-  end
-
   protected
 
   def find_current_links user