Mercurial > hg > soundsoftware-site

diff app/controllers/users_controller.rb @ 1517:dffacf8a6908 redmine-2.5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update to Redmine SVN revision 13367 on 2.5-stable branch
author Chris Cannam
date Tue, 09 Sep 2014 09:29:00 +0100
parents e248c7af89ec
children a1bdbf8a87d5
line wrap: on
line diff
--- a/app/controllers/users_controller.rb	Tue Sep 09 09:28:31 2014 +0100
+++ b/app/controllers/users_controller.rb	Tue Sep 09 09:29:00 2014 +0100
@@ -90,11 +90,9 @@
     @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|