Scarab commit: svn commit: r11031 - trunk/src/java/org/tigris/scarab: notification om

Author: dabbous
Date: 2010-11-24 08:15:51-0800
New Revision: 11031

Modified:
   trunk/src/java/org/tigris/scarab/notification/ScarabNotificationManager.java
   trunk/src/java/org/tigris/scarab/om/NotificationRuleManager.java

Log:
Now the TransitionToSealed check is only performed, if an issue IS in the Sealed state. Only then it makes sense to check if it "has been selead wihtin this notification". 

So if an issue isSealed() AND activitySet.hasTransitionToSelaed() then send notification (means: this issue has been set to sealed and no more notifications will occur).


Modified: trunk/src/java/org/tigris/scarab/notification/ScarabNotificationManager.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/java/org/tigris/scarab/notification/ScarabNotificationManager.java?view=diff&pathrev=11031&r1=11030&r2=11031
==============================================================================
--- trunk/src/java/org/tigris/scarab/notification/ScarabNotificationManager.java	(original)
+++ trunk/src/java/org/tigris/scarab/notification/ScarabNotificationManager.java	2010-11-24 08:15:51-0800
@@ -160,7 +160,6 @@
     {
         try
         {
-            boolean containsTransitionToSealed = activitySet.hasTransitionSealed();
             NotificationStatus notification = null;
             for (Iterator<Activity> it = activitySet.getActivityList().iterator(); it.hasNext(); )
             {
@@ -201,7 +200,7 @@
                             Integer userId      = user.getUserId();
     
                             boolean isSelf = userId.equals(fromUser.getUserId());
-                            boolean wantsNotification = NotificationRuleManager.isNotificationEnabledFor(user, issue, isSelf, activityType, containsTransitionToSealed);
+                            boolean wantsNotification = NotificationRuleManager.isNotificationEnabledFor(user, issue, isSelf, activityType, activitySet);
                             
                             if(wantsNotification)
                             {

Modified: trunk/src/java/org/tigris/scarab/om/NotificationRuleManager.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/java/org/tigris/scarab/om/NotificationRuleManager.java?view=diff&pathrev=11031&r1=11030&r2=11031
==============================================================================
--- trunk/src/java/org/tigris/scarab/om/NotificationRuleManager.java	(original)
+++ trunk/src/java/org/tigris/scarab/om/NotificationRuleManager.java	2010-11-24 08:15:51-0800
@@ -104,7 +104,7 @@
      * @throws ScarabException 
      * @throws TorqueException 
      */
-    public static boolean isNotificationEnabledFor(ScarabUser user, Issue issue, boolean isSelf, String activityType, boolean hasGetSealedActivity) throws ScarabException, TorqueException
+    public static boolean isNotificationEnabledFor(ScarabUser user, Issue issue, boolean isSelf, String activityType, ActivitySet activitySet) throws ScarabException, TorqueException
     {
         Integer userId   = user.getUserId();
         Module module    = issue.getModule();
@@ -118,7 +118,7 @@
         }
         else
         {
-            if(issue.isSealed() && !hasGetSealedActivity)
+            if(issue.isSealed() && !activitySet.hasTransitionSealed())
             {
                 isEnabled = false; // Do not send notifications to other users when Issue is "closed"
             }

------------------------------------------------------
http://scarab.tigris.org/ds/viewMessage.do?dsForumId=3577&dsMessageId=2685402