[Rt-commit] r5376 - in rt/branches/3.7-EXPERIMENTAL: . lib/t/regression

[ruz at bestpractical.com]

Author: ruz
Date: Thu Jun 15 18:00:02 2006
New Revision: 5376

Modified:
   rt/branches/3.7-EXPERIMENTAL/   (props changed)
   rt/branches/3.7-EXPERIMENTAL/lib/RT/Ticket_Overlay.pm
   rt/branches/3.7-EXPERIMENTAL/lib/RT/Tickets_Overlay.pm
   rt/branches/3.7-EXPERIMENTAL/lib/t/regression/07-rights.t

Log:
 r3118 at cubic-pc (orig r5295):  jesse | 2006-05-26 05:15:05 +0400
  r9823 at jesse-vincents-computer-2:  jesse | 2006-05-25 21:12:39 -0400
  * Quieting down some redefinition warnings
 


Modified: rt/branches/3.7-EXPERIMENTAL/lib/RT/Ticket_Overlay.pm
==============================================================================

Modified: rt/branches/3.7-EXPERIMENTAL/lib/RT/Tickets_Overlay.pm
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/lib/RT/Tickets_Overlay.pm	(original)
+++ rt/branches/3.7-EXPERIMENTAL/lib/RT/Tickets_Overlay.pm	Thu Jun 15 18:00:02 2006
@@ -1303,7 +1303,6 @@
     my $field = $rest{SUBKEY} || die "No field specified";
 
     # For our sanity, we can only limit on one queue at a time
-
     my ($queue, $cfid);
     ($queue, $field, $cfid ) = $self->_CustomFieldDecipher( $field );
 
@@ -1330,9 +1329,9 @@
             ENTRYAGGREGATOR => 'AND',
         );
     }
-    
+
     $self->_OpenParen if $null_columns_ok;
-    
+
     $self->_SQLLimit(
         ALIAS      => $TicketCFs,
         FIELD      => 'Content',

Modified: rt/branches/3.7-EXPERIMENTAL/lib/t/regression/07-rights.t
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/lib/t/regression/07-rights.t	(original)
+++ rt/branches/3.7-EXPERIMENTAL/lib/t/regression/07-rights.t	Thu Jun 15 18:00:02 2006
@@ -113,7 +113,7 @@
 $group = RT::Group->new( $RT::SystemUser );
 ok( $group->LoadQueueRoleGroup( Queue => $queue_id, Type=> 'AdminCc' ), "load queue AdminCc role group" );
 $ace = RT::ACE->new( $RT::SystemUser );
-my ($ace_id, $msg) = $group->PrincipalObj->GrantRight( Right => 'ModifyTicket', Object => $queue );
+($ace_id, $msg) = $group->PrincipalObj->GrantRight( Right => 'ModifyTicket', Object => $queue );
 ok( $ace_id, "Granted queue AdminCc role group with ModifyTicket right: $msg" );
 ok( $group->PrincipalObj->HasRight( Right => 'ModifyTicket', Object => $queue ), "role group can modify ticket" );
 ok( !$user->HasRight( Right => 'ModifyTicket', Object => $ticket ), "user is not AdminCc and can't modify ticket" );