[Rt-commit] r7122 - in rt/branches/3.7-EXPERIMENTAL: . html/Ticket html/Ticket/Elements

[ruz at bestpractical.com]

Author: ruz
Date: Fri Mar  2 21:22:46 2007
New Revision: 7122

Modified:
   rt/branches/3.7-EXPERIMENTAL/   (props changed)
   rt/branches/3.7-EXPERIMENTAL/html/Ticket/Elements/ShowTransaction
   rt/branches/3.7-EXPERIMENTAL/html/Ticket/Forward.html
   rt/branches/3.7-EXPERIMENTAL/lib/RT/Queue_Overlay.pm

Log:
 r4654 at cubic-pc:  cubic | 2007-03-03 02:20:55 +0300
 Forwardind
 * ACL
 * $ForwardPath arg in ShowTransaction
 


Modified: rt/branches/3.7-EXPERIMENTAL/html/Ticket/Elements/ShowTransaction
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/Ticket/Elements/ShowTransaction	(original)
+++ rt/branches/3.7-EXPERIMENTAL/html/Ticket/Elements/ShowTransaction	Fri Mar  2 21:22:46 2007
@@ -81,6 +81,7 @@
 $DisplayPath => RT->Config->Get('WebPath')."/Ticket/Display.html?id=".$Ticket->id
 $AttachPath => RT->Config->Get('WebPath')."/Ticket/Attachment"
 $UpdatePath => RT->Config->Get('WebPath')."/Ticket/Update.html"
+$ForwardPath => RT->Config->Get('WebPath')."/Ticket/Forward.html"
 $EmailRecordPath => RT->Config->Get('WebPath')."/Ticket/ShowEmailRecord.html"
 $Attachments => undef
 $AttachmentContent => undef
@@ -194,12 +195,11 @@
               . "&Action=Comment\">"
               . loc('Comment') . "</a>]";
         }
-        if ( $can_modify || $Transaction->TicketObj->CurrentUserHasRight('ForwardMessage') ) {
+        if ( $Transaction->TicketObj->CurrentUserHasRight('ForwardMessage') ) {
             $titlebar_commands .=
-                "[<a href=\"/Ticket/Forward.html?id="
-              . $Transaction->Ticket
-              . "&QuoteTransaction="
-              . $Transaction->Id
+                "[<a href=\"". $ForwardPath
+              . "?id=". $Transaction->Ticket
+              . "&QuoteTransaction=". $Transaction->Id
               . "\">". loc('Forward') . "</a>]";
         }
     }

Modified: rt/branches/3.7-EXPERIMENTAL/html/Ticket/Forward.html
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/html/Ticket/Forward.html	(original)
+++ rt/branches/3.7-EXPERIMENTAL/html/Ticket/Forward.html	Fri Mar  2 21:22:46 2007
@@ -31,6 +31,9 @@
 my $TicketObj = LoadTicket($id);
 $id = $ARGS{'id'} = $TicketObj->id;
 
+Abort( loc("Permission denied") )
+    unless $TicketObj->CurrentUserHasRight('ForwardMessage');
+
 my $txn = RT::Transaction->new( $session{'CurrentUser'} );
 $txn->Load( $QuoteTransaction );
 Abort( loc("Couldn't load transaction #[_1]", $QuoteTransaction) )

Modified: rt/branches/3.7-EXPERIMENTAL/lib/RT/Queue_Overlay.pm
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/lib/RT/Queue_Overlay.pm	(original)
+++ rt/branches/3.7-EXPERIMENTAL/lib/RT/Queue_Overlay.pm	Fri Mar  2 21:22:46 2007
@@ -114,6 +114,8 @@
     TakeTicket      => 'Take tickets',                                # loc_pair
     StealTicket     => 'Steal tickets',                               # loc_pair
 
+    ForwardMessage  => 'Forward messages to third person(s)',         # loc_pair
+
 };
 
 # Tell RT::ACE that this sort of object can get acls granted