Fixed: no email sent with 'Notifiy for any event on the selected projects only' (#7421).

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

Fixed: no email sent with 'Notifiy for any event on the selected projects only' (#7421).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4761 e93f8b46-1217-0410-a6f0-8f06a7374b81
710edf6c · Jean-Philippe Lang · Eric Davis · 8957b56b · 710edf6c · 710edf6c
Commit 710edf6c authored Jan 24, 2011 by Jean-Philippe Lang Committed by Eric Davis Feb 10, 2011
Hide whitespace changes
Inline Side-by-side

Showing with 23 additions and 1 deletion

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

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

No files found.
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -422,7 +422,12 @@ class User < Principal
    when 'all'
      true
    when 'selected'
-      # Handled by the Project
+      # user receives notifications for created/assigned issues on unselected projects
+      if object.is_a?(Issue) && (object.author == self || object.assigned_to == self)
+        true
+      else
+        false
+      end
    when 'none'
      false
    when 'only_my_events'

--- a/test/unit/user_test.rb
+++ b/test/unit/user_test.rb
@@ -468,6 +468,7 @@ class UserTest < ActiveSupport::TestCase
      
      should "be false for a user with :only_my_events and isn't an author, creator, or assignee" do
        @user = User.generate_with_protected!(:mail_notification => 'only_my_events')
+        Member.create!(:user => @user, :project => @project, :role_ids => [1])
        assert ! @user.notify_about?(@issue)
      end
      
@@ -500,6 +501,22 @@ class UserTest < ActiveSupport::TestCase
        @assignee.update_attribute(:mail_notification, 'only_owner')
        assert ! @assignee.notify_about?(@issue)
      end
+      
+      should "be true for a user with :selected and is the author" do
+        @author.update_attribute(:mail_notification, 'selected')
+        assert @author.notify_about?(@issue)
+      end
+      
+      should "be true for a user with :selected and is the assignee" do
+        @assignee.update_attribute(:mail_notification, 'selected')
+        assert @assignee.notify_about?(@issue)
+      end
+      
+      should "be false for a user with :selected and is not the author or assignee" do
+        @user = User.generate_with_protected!(:mail_notification => 'selected')
+        Member.create!(:user => @user, :project => @project, :role_ids => [1])
+        assert ! @user.notify_about?(@issue)
+      end
    end

    context "other events" do