Scarab commit: svn commit: r10191 - branches/release/b21/src: conf/classes java/org/tigris/scarab/actions java/org/tigris/scarab/notification java/org/tigris/scarab/om
[email protected] 26 Jun 2006 23:02:22 -0000
Newsgroups
gmane.comp.java.scarab.cvs
Message-ID
<[email protected] >
Author: dabbous
Date: 2006-06-26 16:02:22-0700
New Revision: 10191
Modified:
branches/release/b21/src/conf/classes/ScarabBundle_de.properties
branches/release/b21/src/java/org/tigris/scarab/actions/AssignIssue.java
branches/release/b21/src/java/org/tigris/scarab/actions/ModifyIssue.java
branches/release/b21/src/java/org/tigris/scarab/actions/MoveIssue.java
branches/release/b21/src/java/org/tigris/scarab/actions/ReportIssue.java
branches/release/b21/src/java/org/tigris/scarab/notification/NotificationManager.java
branches/release/b21/src/java/org/tigris/scarab/notification/ScarabNewNotificationManager.java
branches/release/b21/src/java/org/tigris/scarab/notification/ScarabNotificationManager.java
branches/release/b21/src/java/org/tigris/scarab/om/Issue.java
branches/release/b21/src/java/org/tigris/scarab/om/NotificationFilterManager.java
Log:
- added one missing resource in the german bundle (around NotificationFilter customization)
- Now the customization of NotificationFilter takes into account the secnd column in the
Notification customization screen. (enable/disable send of Notification Emails to self.
Modified: branches/release/b21/src/conf/classes/ScarabBundle_de.properties
Url: http://scarab.tigris.org/source/browse/scarab/branches/release/b21/src/conf/classes/ScarabBundle_de.properties?view=diff&rev=10191&p1=branches/release/b21/src/conf/classes/ScarabBundle_de.properties&p2=branches/release/b21/src/conf/classes/ScarabBundle_de.properties&r1=10190&r2=10191
==============================================================================
--- branches/release/b21/src/conf/classes/ScarabBundle_de.properties (original)
+++ branches/release/b21/src/conf/classes/ScarabBundle_de.properties 2006-06-26 16:02:22-0700
@@ -1409,6 +1409,7 @@
ActivityTypeFailureText=Online Benachrichtigung im Fehlerfall.
ActivityTypeIssueMoved = Ticket verschoben
+ActivityTypeIssueDeleted = Ticket gelöscht
ActivityTypeDependencyChanged = Abhängigkeit geändert
ActivityTypeDependencyCreated = Abhängigkeit erzeugt
ActivityTypeURLAdded = URL hinzugefügt
Modified: branches/release/b21/src/java/org/tigris/scarab/actions/AssignIssue.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/release/b21/src/java/org/tigris/scarab/actions/AssignIssue.java?view=diff&rev=10191&p1=branches/release/b21/src/java/org/tigris/scarab/actions/AssignIssue.java&p2=branches/release/b21/src/java/org/tigris/scarab/actions/AssignIssue.java&r1=10190&r2=10191
==============================================================================
--- branches/release/b21/src/java/org/tigris/scarab/actions/AssignIssue.java (original)
+++ branches/release/b21/src/java/org/tigris/scarab/actions/AssignIssue.java 2006-06-26 16:02:22-0700
@@ -503,7 +503,7 @@
NotificationManagerFactory.getInstance()
.addActivityNotification(
ActivityType.USER_ATTRIBUTE_CHANGED,
- activitySet, issue);
+ activitySet, issue, user);
}
catch(Exception e)
{
Modified: branches/release/b21/src/java/org/tigris/scarab/actions/ModifyIssue.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/release/b21/src/java/org/tigris/scarab/actions/ModifyIssue.java?view=diff&rev=10191&p1=branches/release/b21/src/java/org/tigris/scarab/actions/ModifyIssue.java&p2=branches/release/b21/src/java/org/tigris/scarab/actions/ModifyIssue.java&r1=10190&r2=10191
==============================================================================
--- branches/release/b21/src/java/org/tigris/scarab/actions/ModifyIssue.java (original)
+++ branches/release/b21/src/java/org/tigris/scarab/actions/ModifyIssue.java 2006-06-26 16:02:22-0700
@@ -410,7 +410,7 @@
scarabR.setConfirmMessage(L10NKeySet.ChangesSaved);
NotificationManagerFactory.getInstance().addActivityNotification(
ActivityType.ATTRIBUTE_CHANGED,
- activitySet, issue);
+ activitySet, issue, user);
}
catch (Exception se)
{
@@ -512,7 +512,7 @@
NotificationManagerFactory.getInstance()
.addActivityNotification(
ActivityType.URL_ADDED, activitySet,
- issue);
+ issue, user);
}
}
@@ -648,7 +648,7 @@
NotificationManagerFactory.getInstance()
.addActivityNotification(
ActivityType.ATTACHMENT_CREATED,
- activitySet, issue);
+ activitySet, issue, user);
}
else
@@ -860,7 +860,7 @@
{
scarabR.setConfirmMessage(DEFAULT_MSG);
NotificationManagerFactory.getInstance().addActivityNotification(
- ActivityType.URL_DELETED, activitySet, issue);
+ ActivityType.URL_DELETED, activitySet, issue, user);
}
else
{
@@ -937,7 +937,7 @@
}
NotificationManagerFactory.getInstance().addActivityNotification(
ActivityType.ATTACHMENT_REMOVED, activitySet,
- issue);
+ issue, user);
}
else
{
@@ -1271,11 +1271,11 @@
NotificationManagerFactory.getInstance()
.addActivityNotification(
ActivityType.DEPENDENCY_CREATED,
- activitySet, childIssue);
+ activitySet, childIssue, user);
NotificationManagerFactory.getInstance()
.addActivityNotification(
ActivityType.DEPENDENCY_CREATED,
- activitySet, issue);
+ activitySet, issue, user);
}
return true;
}
@@ -1362,7 +1362,7 @@
scarabR.setConfirmMessage(DEFAULT_MSG);
NotificationManagerFactory.getInstance().addActivityNotification(
ActivityType.DEPENDENCY_CHANGED,
- activitySet, issue);
+ activitySet, issue, user);
return true;
}
else // nothing changed
@@ -1439,7 +1439,7 @@
scarabR.setConfirmMessage(DEFAULT_MSG);
NotificationManagerFactory.getInstance().addActivityNotification(
ActivityType.DEPENDENCY_CHANGED,
- activitySet, issue);
+ activitySet, issue, user);
return true;
}
Modified: branches/release/b21/src/java/org/tigris/scarab/actions/MoveIssue.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/release/b21/src/java/org/tigris/scarab/actions/MoveIssue.java?view=diff&rev=10191&p1=branches/release/b21/src/java/org/tigris/scarab/actions/MoveIssue.java&p2=branches/release/b21/src/java/org/tigris/scarab/actions/MoveIssue.java&r1=10190&r2=10191
==============================================================================
--- branches/release/b21/src/java/org/tigris/scarab/actions/MoveIssue.java (original)
+++ branches/release/b21/src/java/org/tigris/scarab/actions/MoveIssue.java 2006-06-26 16:02:22-0700
@@ -336,7 +336,7 @@
// Send notification for the target issue/module
NotificationManagerFactory.getInstance().addActivityNotification(
activityType,
- newIssue.getLastActivitySet(), issue, null, null);
+ newIssue.getLastActivitySet(), issue, null, null, user);
// If it's moved, should also notify users associated in the old
// location because the issue is dissapearing from there.
@@ -347,7 +347,7 @@
.addActivityNotification(
activityType,
issue.getLastActivitySet(), issue, null,
- null);
+ null, user);
}
}
Modified: branches/release/b21/src/java/org/tigris/scarab/actions/ReportIssue.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/release/b21/src/java/org/tigris/scarab/actions/ReportIssue.java?view=diff&rev=10191&p1=branches/release/b21/src/java/org/tigris/scarab/actions/ReportIssue.java&p2=branches/release/b21/src/java/org/tigris/scarab/actions/ReportIssue.java&r1=10190&r2=10191
==============================================================================
--- branches/release/b21/src/java/org/tigris/scarab/actions/ReportIssue.java (original)
+++ branches/release/b21/src/java/org/tigris/scarab/actions/ReportIssue.java 2006-06-26 16:02:22-0700
@@ -577,7 +577,7 @@
NotificationManagerFactory.getInstance()
.addActivityNotification(
ActivityType.ISSUE_CREATED,
- activitySet, issue);
+ activitySet, issue, user);
cleanup(data, context);
data.getParameters().add("id", issue.getUniqueId().toString());
@@ -699,13 +699,13 @@
if (attachment.getData() != null
&& attachment.getData().trim().length() > 0)
{
+ ScarabUser user = (ScarabUser)data.getUser();
activitySet =
- prevIssue.addComment(activitySet, attachment,
- (ScarabUser)data.getUser());
+ prevIssue.addComment(activitySet, attachment, user);
NotificationManagerFactory.getInstance()
.addActivityNotification(
ActivityType.COMMENT_ADDED,
- activitySet, issue, null, null);
+ activitySet, issue, null, null, user);
scarabR.setConfirmMessage(L10NKeySet.CommentAdded);
}
else
Modified: branches/release/b21/src/java/org/tigris/scarab/notification/NotificationManager.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/release/b21/src/java/org/tigris/scarab/notification/NotificationManager.java?view=diff&rev=10191&p1=branches/release/b21/src/java/org/tigris/scarab/notification/NotificationManager.java&p2=branches/release/b21/src/java/org/tigris/scarab/notification/NotificationManager.java&r1=10190&r2=10191
==============================================================================
--- branches/release/b21/src/java/org/tigris/scarab/notification/NotificationManager.java (original)
+++ branches/release/b21/src/java/org/tigris/scarab/notification/NotificationManager.java 2006-06-26 16:02:22-0700
@@ -3,6 +3,7 @@
import java.util.Set;
import org.tigris.scarab.om.ActivitySet;
+import org.tigris.scarab.om.ScarabUser;
import org.tigris.scarab.notification.ActivityType;
import org.tigris.scarab.om.Issue;
import org.tigris.scarab.util.EmailContext;
@@ -53,10 +54,11 @@
* The activity set describing the event
* @param issue
* The issue affected by the event
+ * @param fromUser TODO
* @see #addActivityNotification(NotificationEvent, EmailContext, ActivitySet, Issue, Set, Set)
*/
public void addActivityNotification(ActivityType event,
- ActivitySet activitySet, Issue issue);
+ ActivitySet activitySet, Issue issue, ScarabUser fromUser);
/**
* Long version of the addActivityNotification method, allowing to pass the sets of
@@ -72,11 +74,12 @@
* List of users intended to be notified as 'To:'
* @param ccUsers
* List of users intended to be notified in 'CC:'
- * @see #addActivityNotification(NotificationEvent, ActivitySet, Issue)
+ * @param fromUser TODO
+ * @see #addActivityNotification(NotificationEvent, ActivitySet, Issue, ScarabUser)
*/
public void addActivityNotification(ActivityType event,
ActivitySet activitySet, Issue issue,
- Set toUsers, Set ccUsers);
+ Set toUsers, Set ccUsers, ScarabUser fromUser);
/**
* Implementations of this method should provide the means to send the
Modified: branches/release/b21/src/java/org/tigris/scarab/notification/ScarabNewNotificationManager.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/release/b21/src/java/org/tigris/scarab/notification/ScarabNewNotificationManager.java?view=diff&rev=10191&p1=branches/release/b21/src/java/org/tigris/scarab/notification/ScarabNewNotificationManager.java&p2=branches/release/b21/src/java/org/tigris/scarab/notification/ScarabNewNotificationManager.java&r1=10190&r2=10191
==============================================================================
--- branches/release/b21/src/java/org/tigris/scarab/notification/ScarabNewNotificationManager.java (original)
+++ branches/release/b21/src/java/org/tigris/scarab/notification/ScarabNewNotificationManager.java 2006-06-26 16:02:22-0700
@@ -112,14 +112,15 @@
* filtering.
*/
public void addActivityNotification(ActivityType event,
- ActivitySet activitySet, Issue issue)
+ ActivitySet activitySet, Issue issue, ScarabUser fromUser)
{
this.addActivityNotification(
event,
activitySet,
issue,
null,
- null);
+ null,
+ fromUser);
}
/**
@@ -127,12 +128,12 @@
* users involved as 'To' or 'CC'.
*/
public void addActivityNotification(ActivityType event, ActivitySet activitySet, Issue issue,
- Set toUsers, Set ccUsers)
+ Set toUsers, Set ccUsers, ScarabUser fromUser)
{
if (log.isDebugEnabled())
log.debug("addActivityNotification: " + issue.getIdPrefix()
+ issue.getIssueId() + "-" + event.getCode());
- this.queueNotifications(activitySet, issue);
+ this.queueNotifications(activitySet, issue, fromUser);
}
/**
@@ -140,7 +141,7 @@
*
* @param activitySet
*/
- private void queueNotifications(ActivitySet activitySet, Issue issue)
+ private void queueNotifications(ActivitySet activitySet, Issue issue, ScarabUser fromUser)
{
try
{
@@ -169,7 +170,8 @@
ScarabUser user = (ScarabUser)itusers.next();
String activityType = act.getActivityType();
Integer userId = user.getUserId();
- boolean wantsNotification = NotificationFilterManager.isNotificationEnabledFor(moduleId, userId, activityType);
+ boolean isSelf = user.getUserId().equals(fromUser.getUserId());
+ boolean wantsNotification = NotificationFilterManager.isNotificationEnabledFor(moduleId, userId, isSelf, activityType);
if(wantsNotification)
{
NotificationStatus notification = new NotificationStatus(user, act);
Modified: branches/release/b21/src/java/org/tigris/scarab/notification/ScarabNotificationManager.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/release/b21/src/java/org/tigris/scarab/notification/ScarabNotificationManager.java?view=diff&rev=10191&p1=branches/release/b21/src/java/org/tigris/scarab/notification/ScarabNotificationManager.java&p2=branches/release/b21/src/java/org/tigris/scarab/notification/ScarabNotificationManager.java&r1=10190&r2=10191
==============================================================================
--- branches/release/b21/src/java/org/tigris/scarab/notification/ScarabNotificationManager.java (original)
+++ branches/release/b21/src/java/org/tigris/scarab/notification/ScarabNotificationManager.java 2006-06-26 16:02:22-0700
@@ -42,14 +42,14 @@
* filtering.
*/
public void addActivityNotification(ActivityType event,
- ActivitySet activitySet, Issue issue)
+ ActivitySet activitySet, Issue issue, ScarabUser fromUser)
{
this.addActivityNotification(
event,
activitySet,
issue,
null,
- null);
+ null, fromUser);
}
/**
@@ -57,7 +57,7 @@
* users involved as 'To' or 'CC'.
*/
public void addActivityNotification(ActivityType event, ActivitySet activitySet, Issue issue,
- Set toUsers, Set ccUsers)
+ Set toUsers, Set ccUsers, ScarabUser fromUser)
{
if (log.isDebugEnabled())
log.debug("addActivityNotification: " + issue.getIdPrefix()
Modified: branches/release/b21/src/java/org/tigris/scarab/om/Issue.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/release/b21/src/java/org/tigris/scarab/om/Issue.java?view=diff&rev=10191&p1=branches/release/b21/src/java/org/tigris/scarab/om/Issue.java&p2=branches/release/b21/src/java/org/tigris/scarab/om/Issue.java&r1=10190&r2=10191
==============================================================================
--- branches/release/b21/src/java/org/tigris/scarab/om/Issue.java (original)
+++ branches/release/b21/src/java/org/tigris/scarab/om/Issue.java 2006-06-26 16:02:22-0700
@@ -609,7 +609,7 @@
ActivityType.COMMENT_ADDED, attachment);
NotificationManagerFactory.getInstance().addActivityNotification(
- ActivityType.COMMENT_ADDED, activitySet, this);
+ ActivityType.COMMENT_ADDED, activitySet, this, user);
return activitySet;
}
@@ -2938,7 +2938,7 @@
}
NotificationManagerFactory.getInstance()
.addActivityNotification(ActivityType.ISSUE_DELETED,
- activitySet, this);
+ activitySet, this, user);
}
save();
}
@@ -3409,7 +3409,7 @@
ActivityType.URL_DESC_CHANGED, attachment,
oldDescription, newDescription);
NotificationManagerFactory.getInstance().addActivityNotification(
- ActivityType.URL_DESC_CHANGED, activitySet, this);
+ ActivityType.URL_DESC_CHANGED, activitySet, this, user);
}
return activitySet;
}
@@ -3456,7 +3456,7 @@
newUrl);
NotificationManagerFactory.getInstance().addActivityNotification(
- ActivityType.URL_CHANGED, activitySet, this);
+ ActivityType.URL_CHANGED, activitySet, this, user);
}
return activitySet;
}
@@ -3813,7 +3813,7 @@
NotificationManagerFactory.getInstance().addActivityNotification(
ActivityType.COMMENT_CHANGED, activitySet,
- this);
+ this, user);
}
return activitySet;
}
Modified: branches/release/b21/src/java/org/tigris/scarab/om/NotificationFilterManager.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/release/b21/src/java/org/tigris/scarab/om/NotificationFilterManager.java?view=diff&rev=10191&p1=branches/release/b21/src/java/org/tigris/scarab/om/NotificationFilterManager.java&p2=branches/release/b21/src/java/org/tigris/scarab/om/NotificationFilterManager.java&r1=10190&r2=10191
==============================================================================
--- branches/release/b21/src/java/org/tigris/scarab/om/NotificationFilterManager.java (original)
+++ branches/release/b21/src/java/org/tigris/scarab/om/NotificationFilterManager.java 2006-06-26 16:02:22-0700
@@ -138,10 +138,18 @@
* @return
* @throws ScarabException
*/
- public static boolean isNotificationEnabledFor(Integer moduleId, Integer userId, String activityType) throws ScarabException
+ public static boolean isNotificationEnabledFor(Integer moduleId, Integer userId, boolean isSelf, String activityType) throws ScarabException
{
NotificationFilter filter = getNotificationFilter(moduleId, userId, activityType);
- boolean result = filter.getFilterState();
+ boolean result;
+ if(isSelf)
+ {
+ result = filter.getSendSelf();
+ }
+ else
+ {
+ result = filter.getFilterState();
+ }
return result;
}