summaryrefslogtreecommitdiffstats
path: root/app/models/user.rb
diff options
context:
space:
mode:
authorEric Davis <edavis@littlestreamsoftware.com>2010-09-28 22:13:06 +0000
committerEric Davis <edavis@littlestreamsoftware.com>2010-09-28 22:13:06 +0000
commit437690119b0b1bd462d45f2367c1fe805e529972 (patch)
treeacab2ce9db00d12e8ef9ae962234f0da341e00bc /app/models/user.rb
parent26ef9da02b7ef7550712317ad050e5a2f31744c6 (diff)
downloadredmine-437690119b0b1bd462d45f2367c1fe805e529972.tar.gz
redmine-437690119b0b1bd462d45f2367c1fe805e529972.zip
Allow admins to edit user's email notifications and preferences. #3503
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4223 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/models/user.rb')
-rw-r--r--app/models/user.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/user.rb b/app/models/user.rb
index 0ac5e7d63..481c832b4 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -74,7 +74,7 @@ class User < Principal
validates_confirmation_of :password, :allow_nil => true
def before_create
- self.mail_notification = Setting.default_notification_option
+ self.mail_notification = Setting.default_notification_option if self.mail_notification.blank?
true
end