From 2d330838cf5a763d8de2bea752b4e37cf2caa249 Mon Sep 17 00:00:00 2001 From: jessib Date: Thu, 31 Jan 2013 13:09:00 -0800 Subject: 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. --- users/app/controllers/v1/users_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'users/app/controllers') 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 -- cgit v1.2.3