Scarab commit: svn commit: r10741 - branches/release/0.22/src/webapp/WEB-INF/templates/email/notification
Hussayn Dabbous <[email protected]>
| Newsgroups | gmane.comp.java.scarab.cvs |
|---|---|
| Message-ID | <[email protected]> |
Author: dabbous
Date: 2009-05-31 11:40:02-0700
New Revision: 10741
Modified:
branches/release/0.22/src/webapp/WEB-INF/templates/email/notification/IssueActivity.vm
branches/release/0.22/src/webapp/WEB-INF/templates/email/notification/IssueActivityHtml.vm
Log:
SCB2667 fixed. SCB2913 backport to 0.22
Modified: branches/release/0.22/src/webapp/WEB-INF/templates/email/notification/IssueActivity.vm
Url: http://scarab.tigris.org/source/browse/scarab/branches/release/0.22/src/webapp/WEB-INF/templates/email/notification/IssueActivity.vm?view=diff&pathrev=10741&r1=10740&r2=10741
==============================================================================
--- branches/release/0.22/src/webapp/WEB-INF/templates/email/notification/IssueActivity.vm (original)
+++ branches/release/0.22/src/webapp/WEB-INF/templates/email/notification/IssueActivity.vm 2009-05-31 11:40:02-0700
@@ -19,9 +19,11 @@
#set ($user = $issue.ModifiedBy)
#set ($defaultText = $issue.DefaultText)
#set ($module = $issue.Module)
+#set ($issueType = $issue.issueType)
+#set ($rmit = $module.getRModuleIssueType($issueType))
$l10n.ActivityReportOn
- #markup('b')$issue.IssueType.Name $issue.UniqueId - $issue.DefaultText#markup('b')
+ #markup('b')$rmit.displayName $issue.UniqueId - $issue.DefaultText#markup('b')
$l10n.ScarabLink: $issueURL
Modified: branches/release/0.22/src/webapp/WEB-INF/templates/email/notification/IssueActivityHtml.vm
Url: http://scarab.tigris.org/source/browse/scarab/branches/release/0.22/src/webapp/WEB-INF/templates/email/notification/IssueActivityHtml.vm?view=diff&pathrev=10741&r1=10740&r2=10741
==============================================================================
--- branches/release/0.22/src/webapp/WEB-INF/templates/email/notification/IssueActivityHtml.vm (original)
+++ branches/release/0.22/src/webapp/WEB-INF/templates/email/notification/IssueActivityHtml.vm 2009-05-31 11:40:02-0700
@@ -44,12 +44,14 @@
#set ($module = $issue.Module)
#set ($issueURL = "$link.getIssueIdLink($issue)")
#set ($base = "$link.getServerContext()")
+#set ($issueType = $issue.issueType)
+#set ($rmit = $module.getRModuleIssueType($issueType))
<!DOCTYPE html PUBLIC "-//Tigris//DTD XHTML 1.0 Transitional//EN"
"$base/style/tigris_transitional.dtd">
<html>
<head>
- <title>$l10n.ActivityReportOn $issue.IssueType.Name $issue.UniqueId - $issue.DefaultText</title>
+ <title>$l10n.ActivityReportOn $rmit.DisplayName $issue.UniqueId - $issue.DefaultText</title>
<base href="$base" />
<meta http-equiv="Content-type" content="text/html; charset=$charSet" />
<style type="text/css">
@@ -164,7 +166,7 @@
## General issue activities to be reported
#foreach ($not in $ActivityIssue)
- #indexedRowsStart($l10n.Activity $ActivityIssue.size())
+ #indexedRowsStart($l10n.ActivityIssue $ActivityIssue.size())
<td>$not.Activity.getDescription($l10n)</td>
#indexedRowsEnd()
#end
------------------------------------------------------
http://scarab.tigris.org/ds/viewMessage.do?dsForumId=3577&dsMessageId=2357313