diff options
author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2013-05-13 16:38:08 +0000 |
---|---|---|
committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2013-05-13 16:38:08 +0000 |
commit | 10ed306b1935834afa1aad304f1ee5c21cc807d1 (patch) | |
tree | 5edcd6a4384969296e803df80870647d45184706 /app/controllers/users_controller.rb | |
parent | 0dce4761a868eafaf216bf83e41860bf841926d8 (diff) | |
download | redmine-10ed306b1935834afa1aad304f1ee5c21cc807d1.tar.gz redmine-10ed306b1935834afa1aad304f1ee5c21cc807d1.zip |
Fixed that locking and unlocking a user resets the email notification checkbox (#14020).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11839 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/controllers/users_controller.rb')
-rw-r--r-- | app/controllers/users_controller.rb | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 2cc43919c..5dd154dc0 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -93,7 +93,6 @@ class UsersController < ApplicationController 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] : []) @@ -139,7 +138,6 @@ class UsersController < ApplicationController was_activated = (@user.status_change == [User::STATUS_REGISTERED, User::STATUS_ACTIVE]) # 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.save |