diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2013-11-29 21:43:29 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2013-11-29 21:43:29 +0000 |
| commit | 6032263d9b10365c4c8ab0378e38f9a75015b416 (patch) | |
| tree | 0694d0420ab908a38afd601b8eab36817a2b6a63 /app/controllers | |
| parent | e494983e1f746cd6723ffe908c426235eeb57f44 (diff) | |
| download | redmine-6032263d9b10365c4c8ab0378e38f9a75015b416.tar.gz redmine-6032263d9b10365c4c8ab0378e38f9a75015b416.zip | |
Fixed that preferences are not preserved when adding a user fails (#15552).
git-svn-id: http://svn.redmine.org/redmine/trunk@12350 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/users_controller.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 4d89e04f5..5e5cb815e 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -90,11 +90,9 @@ class UsersController < ApplicationController @user.admin = params[:user][:admin] || false @user.login = params[:user][:login] @user.password, @user.password_confirmation = params[:user][:password], params[:user][:password_confirmation] unless @user.auth_source_id + @user.pref.attributes = params[:pref] if @user.save - @user.pref.attributes = params[:pref] - @user.pref.save - Mailer.account_information(@user, @user.password).deliver if params[:send_information] respond_to do |format| |