Scarab commit: svn commit: r10573 - branches/SCB1439-take2/src/java/org/tigris/scarab/notification/ScarabNewNotificationManager.java

Author: hair
Date: 2008-05-11 10:00:13-0700
New Revision: 10573

Modified:
   branches/SCB1439-take2/src/java/org/tigris/scarab/notification/ScarabNewNotificationManager.java

Log:
SCB1439
 only create notifications for activities the user is permitted to see


Modified: branches/SCB1439-take2/src/java/org/tigris/scarab/notification/ScarabNewNotificationManager.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB1439-take2/src/java/org/tigris/scarab/notification/ScarabNewNotificationManager.java?view=diff&rev=10573&p1=branches/SCB1439-take2/src/java/org/tigris/scarab/notification/ScarabNewNotificationManager.java&p2=branches/SCB1439-take2/src/java/org/tigris/scarab/notification/ScarabNewNotificationManager.java&r1=10572&r2=10573
==============================================================================
--- branches/SCB1439-take2/src/java/org/tigris/scarab/notification/ScarabNewNotificationManager.java	(original)
+++ branches/SCB1439-take2/src/java/org/tigris/scarab/notification/ScarabNewNotificationManager.java	2008-05-11 10:00:13-0700
@@ -161,21 +161,23 @@
                     // FIXME: Should we still make difference between CC & TO? If so...
                     // ...do we need this info in the notification_status table??
                     
-                    // FIXME: SCB1439. does the user really have permissions
-                    // to view this attribute?
-                    
-                    Integer moduleId = issue.getModuleId();
-                    String activityType = act.getActivityType();
+                    final Integer moduleId = issue.getModuleId();
+                    final String activityType = act.getActivityType();
 
                     for (Iterator itusers = users.iterator(); itusers.hasNext(); )
                     {
-                        ScarabUser user     = (ScarabUser)itusers.next();
-                        Integer userId      = user.getUserId();
+                        final ScarabUser user     = (ScarabUser)itusers.next();
+                        final Integer userId      = user.getUserId();
 
-                        boolean isSelf = userId.equals(fromUser.getUserId());
-                        boolean wantsNotification = NotificationFilterManager.isNotificationEnabledFor(moduleId, userId, isSelf, activityType);
+                        final boolean isSelf = userId.equals(fromUser.getUserId());
+                        final boolean wantsNotification = NotificationFilterManager
+                                .isNotificationEnabledFor(moduleId, userId, isSelf, activityType);
+
+                        // does the user involved really have permissions
+                        // to view this attribute?
+                        final boolean changeVisible = issue.isAttributeVisible(act.getAttribute(), user);
                         
-                        if(wantsNotification)
+                        if(wantsNotification && changeVisible)
                         {
                             notification = new NotificationStatus(user, act);
                             NotificationStatusPeer.doInsert(notification);