projects
/
arvados.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9acd9d8
)
15954: Allow activating user using an admin token.
author
Tom Clegg <tom@tomclegg.ca>
Tue, 25 Feb 2020 16:12:58 +0000
(11:12 -0500)
committer
Tom Clegg <tom@tomclegg.ca>
Tue, 25 Feb 2020 16:12:58 +0000
(11:12 -0500)
This was intended to work already, but didn't.
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@tomclegg.ca>
services/api/app/controllers/arvados/v1/users_controller.rb
patch
|
blob
|
history
diff --git
a/services/api/app/controllers/arvados/v1/users_controller.rb
b/services/api/app/controllers/arvados/v1/users_controller.rb
index 1cf3b9d78a6e9d6290e9df1886304ba7124638c5..224f2c0bd464ceb182c4bc0a696a823def99393e 100644
(file)
--- a/
services/api/app/controllers/arvados/v1/users_controller.rb
+++ b/
services/api/app/controllers/arvados/v1/users_controller.rb
@@
-45,8
+45,11
@@
class Arvados::V1::UsersController < ApplicationController
end
def activate
+ if params[:id] and params[:id].match(/\D/)
+ params[:uuid] = params.delete :id
+ end
if current_user.andand.is_admin && params[:uuid]
- @object = User.find params[:uuid]
+ @object = User.find
_by_uuid
params[:uuid]
else
@object = current_user
end