3235: Fix UrlGenerationError on 404 page.

[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 805d0d2e8064c4a72765927a03d44249edbf2fb5..67b51a9bc9d043513c82fb6d8b2145a4f0462e68 100644 (file)
--- a/apps/workbench/app/controllers/users_controller.rb
+++ b/apps/workbench/app/controllers/users_controller.rb
@@ -257,13 +257,13 @@ 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']
+      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