Mercurial > hg > soundsoftware-site

comparison 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
comparison
equal deleted inserted replaced
1516:b450a9d58aed 1517:dffacf8a6908
88 @user = User.new(:language => Setting.default_language, :mail_notification => Setting.default_notification_option) 88 @user = User.new(:language => Setting.default_language, :mail_notification => Setting.default_notification_option)
89 @user.safe_attributes = params[:user] 89 @user.safe_attributes = params[:user]
90 @user.admin = params[:user][:admin] || false 90 @user.admin = params[:user][:admin] || false
91 @user.login = params[:user][:login] 91 @user.login = params[:user][:login]
92 @user.password, @user.password_confirmation = params[:user][:password], params[:user][:password_confirmation] unless @user.auth_source_id 92 @user.password, @user.password_confirmation = params[:user][:password], params[:user][:password_confirmation] unless @user.auth_source_id
93 @user.pref.attributes = params[:pref]
93 94
94 if @user.save 95 if @user.save
95 @user.pref.attributes = params[:pref]
96 @user.pref.save
97
98 Mailer.account_information(@user, @user.password).deliver if params[:send_information] 96 Mailer.account_information(@user, @user.password).deliver if params[:send_information]
99 97
100 respond_to do |format| 98 respond_to do |format|
101 format.html { 99 format.html {
102 flash[:notice] = l(:notice_user_successful_create, :id => view_context.link_to(@user.login, user_path(@user))) 100 flash[:notice] = l(:notice_user_successful_create, :id => view_context.link_to(@user.login, user_path(@user)))