[rt-commit] [svn] r671 - in rt/branches/rt-3.1: . html/Ticket lib/RT

[jesse at fsck.com]

Author: jesse
Date: Mon Apr  5 22:43:02 2004
New Revision: 671

Modified:
   rt/branches/rt-3.1/   (props changed)
   rt/branches/rt-3.1/configure.ac   (props changed)
   rt/branches/rt-3.1/html/Ticket/Update.html
   rt/branches/rt-3.1/lib/RT/Queue_Overlay.pm
   rt/branches/rt-3.1/lib/RT/Transaction_Overlay.pm
Log:
 ----------------------------------------------------------------------
 r1224 at debian:  jesse | 2004-04-04T07:42:26.326040Z
 
 Removing the Project Managment prototype from RT 3.1
 ----------------------------------------------------------------------
 r1226 at debian:  jesse | 2004-04-04T08:18:44.600308Z
 
 fixed the scope to actually run 
 ----------------------------------------------------------------------
 r1227 at debian:  jesse | 2004-04-04T08:19:14.490688Z
 
 Increasing apache restart timeouts
 ----------------------------------------------------------------------
 r1229 at debian:  jesse | 2004-04-05T05:40:08.564866Z
 
 Announce a revision # in versions of rt checked out from svn
 
 ----------------------------------------------------------------------
 r1235 at debian:  jesse | 2004-04-06T11:42:03.605934Z
 
 Adding access control checks on display of outgoing email messages
 ----------------------------------------------------------------------
 

Modified: rt/branches/rt-3.1/html/Ticket/Update.html
==============================================================================
--- rt/branches/rt-3.1/html/Ticket/Update.html	(original)
+++ rt/branches/rt-3.1/html/Ticket/Update.html	Mon Apr  5 22:43:02 2004
@@ -95,9 +95,9 @@
 
 
 <& /Elements/Submit, Name => 'SubmitTicket' &>
-
+% if ($TicketObj->CurrentUserHasRight('ShowOutgoingEmail')) {
 <& /Ticket/Elements/PreviewScrips, TicketObj => $TicketObj, %ARGS &>
-
+% }
 </FORM>
 <%INIT>
 

Modified: rt/branches/rt-3.1/lib/RT/Queue_Overlay.pm
==============================================================================
--- rt/branches/rt-3.1/lib/RT/Queue_Overlay.pm	(original)
+++ rt/branches/rt-3.1/lib/RT/Queue_Overlay.pm	Mon Apr  5 22:43:02 2004
@@ -21,6 +21,7 @@
 # 
 # 
 # END LICENSE BLOCK
+
 =head1 NAME
 
   RT::Queue - an RT Queue object
@@ -75,8 +76,9 @@
     ModifyScrips => 'Modify Scrips for this queue',                   # loc_pair
     ShowScrips   => 'Display Scrips for this queue',                  # loc_pair
 
-    ShowTicket         => 'Show ticket summaries',                    # loc_pair
-    ShowTicketComments => 'Show ticket private commentary',           # loc_pair
+    ShowTicket         => 'See ticket summaries',                    # loc_pair
+    ShowTicketComments => 'See ticket private commentary',           # loc_pair
+    ShowOutgoingEmail => 'See exact outgoing email messages and their recipeients',           # loc_pair
 
     Watch => 'Sign up as a ticket Requestor or ticket or queue Cc',   # loc_pair
     WatchAsAdminCc  => 'Sign up as a ticket or queue AdminCc',        # loc_pair

Modified: rt/branches/rt-3.1/lib/RT/Transaction_Overlay.pm
==============================================================================
--- rt/branches/rt-3.1/lib/RT/Transaction_Overlay.pm	(original)
+++ rt/branches/rt-3.1/lib/RT/Transaction_Overlay.pm	Mon Apr  5 22:43:02 2004
@@ -788,6 +788,19 @@
             return (undef);
         }
     }
+    elsif ( $self->__Value('Type') eq 'CommentEmailRecord' ) {
+        unless ( $self->CurrentUserHasRight('ShowTicketComments')
+            && $self->CurrentUserHasRight('ShowOutgoingEmail') ) {
+            return (undef);
+        }
+
+    }
+    elsif ( $self->__Value('Type') eq 'EmailRecord' ) {
+        unless ( $self->CurrentUserHasRight('ShowOutgoingEmail')) {
+            return (undef);
+        }
+
+    }
 
     #if they ain't got rights to see, don't let em
     else {