Scarab commit: svn commit: r10992 - trunk: . src/conf/classes src/java/org/tigris/scarab/om src/webapp/WEB-INF/templates/email/notification
[email protected] Fri, 16 Apr 2010 13:18:21 -0700 (PDT)
| Newsgroups | gmane.comp.java.scarab.cvs |
|---|---|
| Message-ID | <[email protected]> |
Author: dabbous
Date: 2010-04-16 13:18:21-0700
New Revision: 10992
Modified:
trunk/project.properties
trunk/scarab_properties.xml
trunk/src/conf/classes/ScarabBundle_de.properties
trunk/src/conf/classes/ScarabBundle_en.properties
trunk/src/java/org/tigris/scarab/om/Issue.java
trunk/src/webapp/WEB-INF/templates/email/notification/IssueActivitySubject.vm
Log:
SCB3037: Support for assignedTo user on the Email subject line.
Modified: trunk/project.properties
Url: http://scarab.tigris.org/source/browse/scarab/trunk/project.properties?view=diff&pathrev=10992&r1=10991&r2=10992
==============================================================================
--- trunk/project.properties (original)
+++ trunk/project.properties 2010-04-16 13:18:21-0700
@@ -884,10 +884,12 @@
# scarab.common.status.onhold.dateProperty
# scarab.common.status.onhold.reminder.period
# scarab.common.status.sealed.modifyPermission
+# scarab.common.assignedTo
+# scarab.common.assignedCC
#
# Helper properties for the workflow.
# Note: Some of these properties are temporary "hacks"
-# until the workf.ow engine has been improved in such a
+# until the workflow engine has been improved in such a
# way that it can be configured through the Webinterface.
#
@@ -1030,6 +1032,26 @@
scarab.common.status.sealed.modifyPermission=Domain | Edit
+# ------------------------
+# scarab.common.assignedTo
+# ------------------------
+#
+#
+# This is the name of the user attribute which contains "assigned to" information.
+#
+
+scarab.common.assignedTo=AssignedTo
+
+# ------------------------
+# scarab.common.assignedCC
+# ------------------------
+#
+#
+# This is the name of the user attribute which contains "assigned cc" information.
+#
+
+scarab.common.assignedCC=AssignedCC
+
# =====================
# End of Group Workflow
# =====================
@@ -1563,6 +1585,9 @@
# These are some default values that are required for
# the b18-b19 migration build target. DO NOT MODIFY THEM!
#
+# rrently it seems these properties (and the "b18-b19" task)
+# e not used/needed anymore - EXCEPT "scarab.file.max.size"!!
+#
# Relation to ant build:
# ----------------------
# This section directly corresponds to the ant task
Modified: trunk/scarab_properties.xml
Url: http://scarab.tigris.org/source/browse/scarab/trunk/scarab_properties.xml?view=diff&pathrev=10992&r1=10991&r2=10992
==============================================================================
--- trunk/scarab_properties.xml (original)
+++ trunk/scarab_properties.xml 2010-04-16 13:18:21-0700
@@ -986,7 +986,7 @@
<details>
Helper properties for the workflow.
Note: Some of these properties are temporary "hacks"
- until the workf.ow engine has been improved in such a
+ until the workflow engine has been improved in such a
way that it can be configured through the Webinterface.
</details>
@@ -1147,6 +1147,31 @@
property (default = Domain__Edit)
</details>
</property>
+
+ <property>
+ <name>scarab.common.assignedTo</name>
+ <default>AssignedTo</default>
+ <comment/>
+ <type>Runtime</type>
+ <customization modification="optional">advanced</customization>
+ <file/>
+ <details>
+ This is the name of the user attribute which contains "assigned to" information.
+ </details>
+ </property>
+
+ <property>
+ <name>scarab.common.assignedCC</name>
+ <default>AssignedCC</default>
+ <comment/>
+ <type>Runtime</type>
+ <customization modification="optional">advanced</customization>
+ <file/>
+ <details>
+ This is the name of the user attribute which contains "assigned cc" information.
+ </details>
+ </property>
+
</group>
<group name="Turbine-properties">
Modified: trunk/src/conf/classes/ScarabBundle_de.properties
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/conf/classes/ScarabBundle_de.properties?view=diff&pathrev=10992&r1=10991&r2=10992
==============================================================================
--- trunk/src/conf/classes/ScarabBundle_de.properties (original)
+++ trunk/src/conf/classes/ScarabBundle_de.properties 2010-04-16 13:18:21-0700
@@ -1508,7 +1508,7 @@
## ***********************************************************************
# ActivitySet
-DefaultModifyIssueEmailSubject=[{0}] #{1} ({2}) {3}
+DefaultModifyIssueEmailSubject=[{0}] #{1} ({4},{2}) {3}
MinimalModifyIssueEmailSubject=Ticket #{0} geändert
# AbstractScarabModule
Modified: trunk/src/conf/classes/ScarabBundle_en.properties
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/conf/classes/ScarabBundle_en.properties?view=diff&pathrev=10992&r1=10991&r2=10992
==============================================================================
--- trunk/src/conf/classes/ScarabBundle_en.properties (original)
+++ trunk/src/conf/classes/ScarabBundle_en.properties 2010-04-16 13:18:21-0700
@@ -1575,7 +1575,7 @@
## ***********************************************************************
# ActivitySet
-DefaultModifyIssueEmailSubject=[{0}] #{1} ({2}) {3}
+DefaultModifyIssueEmailSubject=[{0}] #{1} ({4},{2}) {3}
MinimalModifyIssueEmailSubject=Issue #{0} modified
# AbstractScarabModule
Modified: trunk/src/java/org/tigris/scarab/om/Issue.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/java/org/tigris/scarab/om/Issue.java?view=diff&pathrev=10992&r1=10991&r2=10992
==============================================================================
--- trunk/src/java/org/tigris/scarab/om/Issue.java (original)
+++ trunk/src/java/org/tigris/scarab/om/Issue.java 2010-04-16 13:18:21-0700
@@ -85,6 +85,7 @@
import org.tigris.scarab.notification.NotificationManagerFactory;
import org.tigris.scarab.services.cache.ScarabCache;
import org.tigris.scarab.services.security.ScarabSecurity;
+import org.tigris.scarab.tools.Environment;
import org.tigris.scarab.tools.ScarabGlobalTool;
import org.tigris.scarab.tools.localization.L10NKeySet;
import org.tigris.scarab.tools.localization.L10NMessage;
@@ -1375,6 +1376,33 @@
}
/**
+ * Return the first user assigned to the current issue. If multiple users are assigned to this issue,
+ * an arbitrary user will be retrieved.
+ * Purpose of this method:
+ * Used to add at least one assigned to user to the Email subject of any Scarab-generated EMail.
+ * @return
+ * @throws TorqueException
+ */
+ public String getFirstAssignedTo() throws TorqueException
+ {
+ String assignedToAttributeName = Environment.getConfigurationProperty("scarab.common.assignedTo", "assignedTo");
+ List<AttributeValue> allAssignedUsers = getUserAttributeValues();
+ Iterator<AttributeValue> iter = allAssignedUsers.iterator();
+ String result = "";
+ while(iter.hasNext())
+ {
+ AttributeValue attval = iter.next();
+ String attributeName = attval.getAttribute().getName();
+ if(attributeName.equals(assignedToAttributeName))
+ {
+ result = attval.getValue();
+ break;
+ }
+ }
+ return result;
+ }
+
+ /**
* Returns attribute values for user attributes.
* If user is not null, only return attributes of the
* given user.
Modified: trunk/src/webapp/WEB-INF/templates/email/notification/IssueActivitySubject.vm
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/WEB-INF/templates/email/notification/IssueActivitySubject.vm?view=diff&pathrev=10992&r1=10991&r2=10992
==============================================================================
--- trunk/src/webapp/WEB-INF/templates/email/notification/IssueActivitySubject.vm (original)
+++ trunk/src/webapp/WEB-INF/templates/email/notification/IssueActivitySubject.vm 2010-04-16 13:18:21-0700
@@ -1 +1 @@
-#set ($args = [$issue.Module.RealName.toUpperCase(), $issue.UniqueId, $l10n.get($changeKey, true), $issue.defaultText]) $l10n.format("DefaultModifyIssueEmailSubject", $args)
+#set ($args = [$issue.Module.RealName.toUpperCase(), $issue.UniqueId, $l10n.get($changeKey, true), $issue.defaultText, $issue.FirstAssignedTo.Name]) $l10n.format("DefaultModifyIssueEmailSubject", $args)
------------------------------------------------------
http://scarab.tigris.org/ds/viewMessage.do?dsForumId=3577&dsMessageId=2585711