Do not show "for only project I select" notification option on application settings form (#7294).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4730 e93f8b46-1217-0410-a6f0-8f06a7374b81

Do not show "for only project I select" notification option on application settings form (#7294).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4730 e93f8b46-1217-0410-a6f0-8f06a7374b81
8933482c · Jean-Philippe Lang · Eric Davis · 16fdf5fe · 8933482c · 8933482c
Commit 8933482c authored Jan 16, 2011 by Jean-Philippe Lang Committed by Eric Davis Feb 10, 2011
Hide whitespace changes
Inline Side-by-side

Showing with 13 additions and 3 deletions

user.rb app/models/user.rb +6 -2

_notifications.rhtml app/views/settings/_notifications.rhtml +1 -1

user_test.rb test/unit/user_test.rb +6 -0

No files found.
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -260,11 +260,15 @@ class User < Principal
    notified_projects_ids
  end

-  # Only users that belong to more than 1 project can select projects for which they are notified
  def valid_notification_options
+    self.class.valid_notification_options(self)
+  end
+
+  # Only users that belong to more than 1 project can select projects for which they are notified
+  def self.valid_notification_options(user=nil)
    # Note that @user.membership.size would fail since AR ignores
    # :include association option when doing a count
-    if memberships.length < 1
+    if user.nil? || user.memberships.length < 1
      MAIL_NOTIFICATION_OPTIONS.reject {|option| option.first == 'selected'}
    else
      MAIL_NOTIFICATION_OPTIONS

--- a/app/views/settings/_notifications.rhtml
+++ b/app/views/settings/_notifications.rhtml
@@ -8,7 +8,7 @@

 <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>
+<p><%= setting_select(:default_notification_option, User.valid_notification_options.collect {|o| [l(o.last), o.first.to_s]}) %></p>

 </div>


--- a/test/unit/user_test.rb
+++ b/test/unit/user_test.rb
@@ -310,6 +310,12 @@ class UserTest < ActiveSupport::TestCase
    assert_equal 6, User.find(2).valid_notification_options.size
  end
  
+  def test_valid_notification_options_class_method
+    assert_equal 5, User.valid_notification_options.size
+    assert_equal 5, User.valid_notification_options(User.find(7)).size
+    assert_equal 6, User.valid_notification_options(User.find(2)).size
+  end
+  
  def test_mail_notification_all
    @jsmith.mail_notification = 'all'
    @jsmith.notified_project_ids = []