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

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
582ed86d · Eric Davis · c059300d · 582ed86d · 582ed86d · 582ed86d
Commit 582ed86d authored Sep 28, 2010 by Eric Davis
5 changed files
--- 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

--- 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>

--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -350,6 +350,7 @@ en:
  setting_start_of_week: Start calendars on
  setting_rest_api_enabled: Enable REST web service
  setting_cache_formatted_text: Cache formatted text
+  setting_default_notification_option: Default notification option
  permission_add_project: Create project
  permission_add_subprojects: Create subprojects

--- a/config/settings.yml
+++ b/config/settings.yml
@@ -184,3 +184,5 @@ start_of_week:
  default: ''
 rest_api_enabled:
  default: 0
+default_notification_option:
+  default: 'only_my_events'
--- a/test/unit/user_test.rb
+++ b/test/unit/user_test.rb
@@ -60,6 +60,18 @@ class UserTest < ActiveSupport::TestCase
    user.password, user.password_confirmation = "password", "password"
    assert user.save
  end
+  context "User#before_create" do
+    should "set the mail_notification to the default Setting" do
+      @user1 = User.generate_with_protected!
+      assert_equal 'only_my_events', @user1.mail_notification
+      with_settings :default_notification_option => 'all' do
+        @user2 = User.generate_with_protected!
+        assert_equal 'all', @user2.mail_notification
+      end
+    end
+  end
  context "User.login" do
    should "be case-insensitive." do