diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-03-04 10:44:59 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-03-04 10:44:59 +0000 |
| commit | 70ced2f2af9ad1fc47a1093ee247978d3a4f698f (patch) | |
| tree | 55324d5b525c7240ef66aa791c6d8ed96ab17e3d /app/controllers/users_controller.rb | |
| parent | eb5a9f83c9aca8559e8e59132c0a068a766d4280 (diff) | |
| download | redmine-70ced2f2af9ad1fc47a1093ee247978d3a4f698f.tar.gz redmine-70ced2f2af9ad1fc47a1093ee247978d3a4f698f.zip | |
Rails 3.1 compatibility.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9067 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/controllers/users_controller.rb')
| -rw-r--r-- | app/controllers/users_controller.rb | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index b1c14c8bc..d22dd33cd 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -93,11 +93,9 @@ class UsersController < ApplicationController @user.login = params[:user][:login] @user.password, @user.password_confirmation = params[:user][:password], params[:user][:password_confirmation] unless @user.auth_source_id - # TODO: Similar to My#account - @user.pref.attributes = params[:pref] - @user.pref[:no_self_notified] = (params[:no_self_notified] == '1') - if @user.save + @user.pref.attributes = params[:pref] + @user.pref[:no_self_notified] = (params[:no_self_notified] == '1') @user.pref.save @user.notified_project_ids = (@user.mail_notification == 'selected' ? params[:notified_project_ids] : []) |