[Rt-commit] r5628 - in rt/branches/3.6-RELEASE: .

[jesse at bestpractical.com]

Author: jesse
Date: Thu Jul 20 15:16:09 2006
New Revision: 5628

Modified:
   rt/branches/3.6-RELEASE/   (props changed)
   rt/branches/3.6-RELEASE/html/Ticket/Elements/EditWatchers
   rt/branches/3.6-RELEASE/html/Ticket/Elements/ShowUserEntry

Log:
 r14235 at pinglin:  jesse | 2006-07-20 12:15:45 -0700
 * Better display of squelched ticket recipients


Modified: rt/branches/3.6-RELEASE/html/Ticket/Elements/EditWatchers
==============================================================================
--- rt/branches/3.6-RELEASE/html/Ticket/Elements/EditWatchers	(original)
+++ rt/branches/3.6-RELEASE/html/Ticket/Elements/EditWatchers	Thu Jul 20 15:16:09 2006
@@ -55,7 +55,11 @@
 <input type="checkbox" class="checkbox" name="Ticket-DeleteWatcher-Type-<%$Watchers->Type%>-Principal-<%$watcher->MemberId%>" value="1" unchecked />
 %if ($watcher->MemberObj->IsUser) { 
 <a href="<%$RT::WebPath%>/Admin/Users/Modify.html?id=<%$watcher->MemberObj->Object->id%>">
-<%$watcher->MemberObj->Object->Name%></a>
+<%$watcher->MemberObj->Object->Name%></a> 
+% if ($TicketObj and grep { $_->Content eq $watcher->MemberObj->Object->EmailAddress } $TicketObj->SquelchMailTo)  {
+<b><&|/l&>(Will not be sent email)</&></b>
+% }
+
 %} else {
 <a href="<%$RT::WebPath%>/Admin/Groups/Modify.html?id=<%$watcher->MemberObj->Object->id%>">
 <%$watcher->MemberObj->Object->Name%></a>

Modified: rt/branches/3.6-RELEASE/html/Ticket/Elements/ShowUserEntry
==============================================================================
--- rt/branches/3.6-RELEASE/html/Ticket/Elements/ShowUserEntry	(original)
+++ rt/branches/3.6-RELEASE/html/Ticket/Elements/ShowUserEntry	Thu Jul 20 15:16:09 2006
@@ -48,10 +48,10 @@
 <%$User->Name%>
 % if ($User->EmailAddress && $User->EmailAddress ne $User->Name) {
 &lt;<%$User->EmailAddress%>&gt;
+% }
 % if ($Ticket and grep { $_->Content eq $User->EmailAddress } $Ticket->SquelchMailTo)  {
 <b><&|/l&>(Will not be sent email)</&></b>
 % }
-% }
 
 <%ARGS>
 $User => undef