diff options
| author | Azul <azul@leap.se> | 2012-12-13 17:16:05 +0100 |
|---|---|---|
| committer | Azul <azul@leap.se> | 2012-12-13 17:16:05 +0100 |
| commit | 32db6e2ee3ae449f2fe0f947f9ac4aafde340a9d (patch) | |
| tree | 1f9abefddc5f3cfb49a96f87e184a78feb8fb506 /users/app/controllers/users_controller.rb | |
| parent | 1a26988cb7ff30061473f4a781166b184b3037ce (diff) | |
| parent | feee17e3a9970ac04f5a789255fbf4c3e8e89eb8 (diff) | |
Merge branch 'feature/email-aliases-model'
Diffstat (limited to 'users/app/controllers/users_controller.rb')
| -rw-r--r-- | users/app/controllers/users_controller.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/users/app/controllers/users_controller.rb b/users/app/controllers/users_controller.rb index 4921a4a..811e8e5 100644 --- a/users/app/controllers/users_controller.rb +++ b/users/app/controllers/users_controller.rb @@ -30,8 +30,11 @@ class UsersController < ApplicationController end def update - if @user.update_attributes(params[:user]) + @user.attributes = params[:user] + if @user.changed? and @user.save flash[:notice] = t(:user_updated_successfully) + else + flash[:error] = @user.errors.full_messages end respond_with @user, :location => edit_user_path(@user) end |