From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Mon, 24 Jan 2011 17:28:59 +0000 (+0000)
Subject: Fixed: no email sent with 'Notifiy for any event on the selected projects only' ... 
X-Git-Tag: 1.2.0~1037
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=73a2d926f6e43d360421eff3e207b42bd5172184;p=redmine.git

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

diff --git a/app/models/user.rb b/app/models/user.rb
index 3cc6b8e40..5b0444016 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -424,7 +424,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'
diff --git a/test/unit/user_test.rb b/test/unit/user_test.rb
index bf5b45a60..63e422701 100644
--- a/test/unit/user_test.rb
+++ b/test/unit/user_test.rb
@@ -672,6 +672,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
       
@@ -704,6 +705,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