summaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorEric Davis <edavis@littlestreamsoftware.com>2010-09-28 18:36:50 +0000
committerEric Davis <edavis@littlestreamsoftware.com>2010-09-28 18:36:50 +0000
commit582ed86d828bb957a7844832c627b425884d0716 (patch)
treefaa4662b8338e5e062e55612bc8da68f38fd9153 /app
parentc059300d99aa439c83372a950087f082c7049018 (diff)
downloadredmine-582ed86d828bb957a7844832c627b425884d0716.tar.gz
redmine-582ed86d828bb957a7844832c627b425884d0716.zip
Add a default mail notification setting for new users
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4219 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app')
-rw-r--r--app/models/user.rb2
-rw-r--r--app/views/settings/_notifications.rhtml3
2 files changed, 4 insertions, 1 deletions
diff --git a/app/models/user.rb b/app/models/user.rb
index 281e71281..0ac5e7d63 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 = 'only_my_events'
+ self.mail_notification = Setting.default_notification_option
true
end
diff --git a/app/views/settings/_notifications.rhtml b/app/views/settings/_notifications.rhtml
index cb1c1abf1..2c62cdf9f 100644
--- a/app/views/settings/_notifications.rhtml
+++ b/app/views/settings/_notifications.rhtml
@@ -7,6 +7,9 @@
<p><%= setting_check_box :bcc_recipients %></p>
<p><%= setting_check_box :plain_text_mail %></p>
+
+<p><%= setting_select(:default_notification_option, User::MAIL_NOTIFICATION_OPTIONS.collect {|o| [l(o.last), o.first.to_s]}) %></p>
+
</div>
<fieldset class="box settings" id="notified_events"><legend><%=l(:text_select_mail_notifications)%></legend>