3114: When current user, show root/home project rather than user attributes when...

[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 836c1852421f4131d41a8e075d11cc4c224c8421..d817b32711fe5d7695a642343a442cd4c394c73e 100644 (file)
--- a/apps/workbench/app/controllers/users_controller.rb
+++ b/apps/workbench/app/controllers/users_controller.rb
@@ -2,6 +2,14 @@ class UsersController < ApplicationController
   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'
@@ -257,10 +265,15 @@ class UsersController < ApplicationController
       key_params['authorized_user_uuid'] = current_user.uuid
 
       if params['name'] && params['name'].size>0
-        key_params['name'] = params['name']
+        key_params['name'] = params['name'].strip
       end
       if params['public_key'] && params['public_key'].size>0
-        key_params['public_key'] = params['public_key']
+        key_params['public_key'] = params['public_key'].strip
+      end
+
+      if !key_params['name'] && params['public_key'].andand.size>0
+        split_key = key_params['public_key'].split
+        key_params['name'] = split_key[-1] if (split_key.size == 3)
       end
 
       new_key = AuthorizedKey.create! key_params