diff options
author | jessib <jessib@leap.se> | 2013-01-31 13:09:00 -0800 |
---|---|---|
committer | jessib <jessib@leap.se> | 2013-01-31 13:09:00 -0800 |
commit | 2d330838cf5a763d8de2bea752b4e37cf2caa249 (patch) | |
tree | 02afa03707a381b4e358fb26fcf0acafd53715ef /users/app/controllers/v1/users_controller.rb | |
parent | afd5697f17a90654b6c058611896e3542a601ef5 (diff) |
Remove public key if the key is passed as nil, but not otherwise.
There was a weird case with reloading the user in the test if the public key had been unset.
Diffstat (limited to 'users/app/controllers/v1/users_controller.rb')
-rw-r--r-- | users/app/controllers/v1/users_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/users/app/controllers/v1/users_controller.rb b/users/app/controllers/v1/users_controller.rb index 9b5997d..617bd4b 100644 --- a/users/app/controllers/v1/users_controller.rb +++ b/users/app/controllers/v1/users_controller.rb @@ -14,7 +14,7 @@ module V1 def update # For now, only allow public key to be updated via the API. Eventually we might want to store in a config what attributes can be updated via the API. @user = User.find_by_param(params[:id]) - @user.update_attributes(:public_key => params[:user][:public_key]) + @user.update_attributes params[:user].slice(:public_key) if params[:user].respond_to?(:slice) respond_with @user end |