projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
6602: remove render_runtime_compact; instead use render_runtime with use_words =...
[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 ac3ea606e9f7421fca4b867be61f7a21a1180ece..4cf1fffc09bb3e3a815311f86c2550bbe16e5f3d 100644
(file)
--- a/
apps/workbench/app/controllers/users_controller.rb
+++ b/
apps/workbench/app/controllers/users_controller.rb
@@
-9,7
+9,11
@@
class UsersController < ApplicationController
if params[:uuid] == current_user.uuid
respond_to do |f|
f.html do
if params[:uuid] == current_user.uuid
respond_to do |f|
f.html do
- redirect_to(params[:return_to] || project_path(params[:uuid]))
+ if request.url.include?("/users/#{current_user.uuid}")
+ super
+ else
+ redirect_to(params[:return_to] || project_path(params[:uuid]))
+ end
end
end
else
end
end
else
@@
-204,9
+208,6
@@
class UsersController < ApplicationController
if params['openid_prefix'] && params['openid_prefix'].size>0
setup_params[:openid_prefix] = params['openid_prefix']
end
if params['openid_prefix'] && params['openid_prefix'].size>0
setup_params[:openid_prefix] = params['openid_prefix']
end
- if params['repo_name'] && params['repo_name'].size>0
- setup_params[:repo_name] = params['repo_name']
- end
if params['vm_uuid'] && params['vm_uuid'].size>0
setup_params[:vm_uuid] = params['vm_uuid']
end
if params['vm_uuid'] && params['vm_uuid'].size>0
setup_params[:vm_uuid] = params['vm_uuid']
end