From 6032263d9b10365c4c8ab0378e38f9a75015b416 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Fri, 29 Nov 2013 21:43:29 +0000 Subject: 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 --- app/controllers/users_controller.rb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'app') 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| -- cgit v1.2.3