[Rt-commit] rt branch, 3.9-trunk, updated. rt-3.9.7-969-ge2eea72

[Ruslan Zakirov]

The branch, 3.9-trunk has been updated
       via  e2eea72b51bf5b11e853715cd1b9ac802b7df02e (commit)
       via  3363415fc3fbdf09695b3b884dab15b3b5097096 (commit)
      from  6ff5f1463d445738305e32d959f4932eff3bf3f3 (commit)

Summary of changes:
 lib/RT/User_Overlay.pm                  |    4 ++--
 share/html/Ticket/Elements/EditWatchers |    6 +-----
 2 files changed, 3 insertions(+), 7 deletions(-)

- Log -----------------------------------------------------------------
commit 3363415fc3fbdf09695b3b884dab15b3b5097096
Author: Christian Loos <cloos at netcologne.de>
Date:   Fri Dec 17 18:15:45 2010 +0100

    more consistent marking of squelched people
    
    This fixes that on Display.html within block People it says only
    'squelched' and on ModifyPeople.html it says 'Will not be sent email'.

diff --git a/lib/RT/User_Overlay.pm b/lib/RT/User_Overlay.pm
index 6b95929..bd71487 100755
--- a/lib/RT/User_Overlay.pm
+++ b/lib/RT/User_Overlay.pm
@@ -613,7 +613,7 @@ sub EmailFrequency {
     return '' unless $self->id && $self->id != RT->Nobody->id
         && $self->id != RT->SystemUser->id;
     return 'no email' unless my $email = $self->EmailAddress;
-    return 'squelched' if $args{'Ticket'} &&
+    return 'Will not be sent email' if $args{'Ticket'} &&
         grep lc $email eq lc $_->Content, $args{'Ticket'}->SquelchMailTo;
     my $frequency = RT->Config->Get( 'EmailFrequency', $self ) || '';
     return 'daily' if $frequency =~ /daily/i;
diff --git a/share/html/Ticket/Elements/EditWatchers b/share/html/Ticket/Elements/EditWatchers
index 0c27e3f..9ed611e 100755
--- a/share/html/Ticket/Elements/EditWatchers
+++ b/share/html/Ticket/Elements/EditWatchers
@@ -58,11 +58,7 @@
 <input type="checkbox" class="checkbox" name="Ticket-DeleteWatcher-Type-<% $Watchers->Type %>-Principal-<% $watcher->MemberId %>" value="1" unchecked />
 % if ( $member->isa( 'RT::User' ) ) { 
 <a href="<% RT->Config->Get('WebPath') %>/Admin/Users/Modify.html?id=<% $watcher->MemberId %>">
-<& /Elements/ShowUser, User => $member &></a>
-% if ($TicketObj and grep { $_->Content eq $member->EmailAddress } $TicketObj->SquelchMailTo)  {
-<b><&|/l&>(Will not be sent email)</&></b>
-% }
-
+<& /Elements/ShowUser, User => $member &></a> <& /Elements/ShowUserEmailFrequency, User => $member, Ticket => $TicketObj &>
 % } else {
 <a href="<% RT->Config->Get('WebPath') %>/Admin/Groups/Modify.html?id=<% $watcher->MemberId %>">
 <% $member->Name %></a>

commit e2eea72b51bf5b11e853715cd1b9ac802b7df02e
Author: Ruslan Zakirov <ruz at bestpractical.com>
Date:   Tue Dec 21 17:46:53 2010 +0300

    more descriptive email frequency

diff --git a/lib/RT/User_Overlay.pm b/lib/RT/User_Overlay.pm
index bd71487..04fddd9 100755
--- a/lib/RT/User_Overlay.pm
+++ b/lib/RT/User_Overlay.pm
@@ -612,8 +612,8 @@ sub EmailFrequency {
     );
     return '' unless $self->id && $self->id != RT->Nobody->id
         && $self->id != RT->SystemUser->id;
-    return 'no email' unless my $email = $self->EmailAddress;
-    return 'Will not be sent email' if $args{'Ticket'} &&
+    return 'no email address' unless my $email = $self->EmailAddress;
+    return 'email disabled for ticket' if $args{'Ticket'} &&
         grep lc $email eq lc $_->Content, $args{'Ticket'}->SquelchMailTo;
     my $frequency = RT->Config->Get( 'EmailFrequency', $self ) || '';
     return 'daily' if $frequency =~ /daily/i;

-----------------------------------------------------------------------