Fixed: "Notifiy for only project I select" is randomly displayed (#7294).

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

Fixed: "Notifiy for only project I select" is randomly displayed (#7294).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4727 e93f8b46-1217-0410-a6f0-8f06a7374b81
16fdf5fe · Jean-Philippe Lang · Eric Davis · ced782ec · 16fdf5fe · 16fdf5fe
Commit 16fdf5fe authored Jan 16, 2011 by Jean-Philippe Lang Committed by Eric Davis Feb 10, 2011
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 3 deletions

user.rb app/models/user.rb +1 -1

user_test.rb test/unit/user_test.rb +9 -2

No files found.
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -265,7 +265,7 @@ class User < Principal
    # Note that @user.membership.size would fail since AR ignores
    # :include association option when doing a count
    if memberships.length < 1
-      MAIL_NOTIFICATION_OPTIONS.delete_if {|option| option.first == 'selected'}
+      MAIL_NOTIFICATION_OPTIONS.reject {|option| option.first == 'selected'}
    else
      MAIL_NOTIFICATION_OPTIONS
    end

--- a/test/unit/user_test.rb
+++ b/test/unit/user_test.rb
-# redMine - project management software
-# Copyright (C) 2006  Jean-Philippe Lang
+# Redmine - project management software
+# Copyright (C) 2006-2011  Jean-Philippe Lang
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -303,6 +303,13 @@ class UserTest < ActiveSupport::TestCase
    assert_nil @dlopper.roles_for_project(Project.find(2)).detect {|role| role.member?}
  end
  
+  def test_valid_notification_options
+    # without memberships
+    assert_equal 5, User.find(7).valid_notification_options.size
+    # with memberships
+    assert_equal 6, User.find(2).valid_notification_options.size
+  end
+  
  def test_mail_notification_all
    @jsmith.mail_notification = 'all'
    @jsmith.notified_project_ids = []