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

[jesse at bestpractical.com]

Author: jesse
Date: Wed Jul 19 18:37:32 2006
New Revision: 5613

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

Log:
 r14207 at pinglin:  jesse | 2006-07-19 15:33:02 -0700
 * Inline display of which ticket watchers are "squelched"
 


Modified: rt/branches/3.6-RELEASE/html/Ticket/Elements/ShowGroupMembers
==============================================================================
--- rt/branches/3.6-RELEASE/html/Ticket/Elements/ShowGroupMembers	(original)
+++ rt/branches/3.6-RELEASE/html/Ticket/Elements/ShowGroupMembers	Wed Jul 19 18:37:32 2006
@@ -47,7 +47,7 @@
 
 % my $UserMembers = $Group->UserMembersObj;
 % while (my $member = $UserMembers->Next()) {
-<& ShowUserEntry, User => $member &><br />
+<& ShowUserEntry, User => $member, Ticket => $Ticket  &><br />
 % }
 % my $GroupMembers = $Group->MembersObj;
 % $GroupMembers->LimitToGroups();
@@ -57,4 +57,5 @@
 
 <%ARGS>
 $Group => undef
-</%ARGS>
\ No newline at end of file
+$Ticket => undef
+</%ARGS>

Modified: rt/branches/3.6-RELEASE/html/Ticket/Elements/ShowPeople
==============================================================================
--- rt/branches/3.6-RELEASE/html/Ticket/Elements/ShowPeople	(original)
+++ rt/branches/3.6-RELEASE/html/Ticket/Elements/ShowPeople	Wed Jul 19 18:37:32 2006
@@ -46,19 +46,19 @@
 <table>
   <tr>
     <td class="label"><&|/l&>Owner</&>:</td>
-    <td class="value"><& ShowUserEntry, User => $Ticket->OwnerObj &></td>
+    <td class="value"><& ShowUserEntry, User => $Ticket->OwnerObj, Ticket => $Ticket &></td>
   </tr>
   <tr>
     <td class="labeltop"><&|/l&>Requestors</&>:</td>
-    <td class="value"><& ShowGroupMembers, Group => $Ticket->Requestors &></td>
+    <td class="value"><& ShowGroupMembers, Group => $Ticket->Requestors, Ticket => $Ticket &></td>
   </tr>
   <tr>
     <td class="labeltop"><&|/l&>Cc</&>:</td>
-    <td class="value"><& ShowGroupMembers, Group => $Ticket->Cc &></td>
+    <td class="value"><& ShowGroupMembers, Group => $Ticket->Cc, Ticket => $Ticket &></td>
   </tr>
   <tr>
     <td class="labeltop"><&|/l&>AdminCc</&>:</td>
-    <td class="value"><& ShowGroupMembers, Group => $Ticket->AdminCc &></td>
+    <td class="value"><& ShowGroupMembers, Group => $Ticket->AdminCc, Ticket => $Ticket &></td>
   </tr>
 </table>
 <%ARGS>

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	Wed Jul 19 18:37:32 2006
@@ -48,8 +48,12 @@
 <%$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
-</%ARGS>
\ No newline at end of file
+$Ticket => undef
+</%ARGS>