[Rt-commit] r5295 - in rt/branches/3.5-TESTING: . lib/RT

[jesse at bestpractical.com]

Author: jesse
Date: Thu May 25 21:15:05 2006
New Revision: 5295

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

Log:
 r9823 at jesse-vincents-computer-2:  jesse | 2006-05-25 21:12:39 -0400
 * Quieting down some redefinition warnings


Modified: rt/branches/3.5-TESTING/lib/RT/Ticket_Overlay.pm
==============================================================================
--- rt/branches/3.5-TESTING/lib/RT/Ticket_Overlay.pm	(original)
+++ rt/branches/3.5-TESTING/lib/RT/Ticket_Overlay.pm	Thu May 25 21:15:05 2006
@@ -3054,9 +3054,9 @@
         return ( 0, $self->loc("Could not change owner. ") . $msg );
     }
 
-    $RT::Handle->Commit();
-
-    my ( $trans, $msg, undef ) = $self->_NewTransaction(
+    $RT::Handle->Commit(); 
+    my $trans;
+    ( $trans, $msg, undef ) = $self->_NewTransaction(
                                                    Type     => $Type,
                                                    Field    => 'Owner',
                                                    NewValue => $NewOwnerObj->Id,

Modified: rt/branches/3.5-TESTING/lib/RT/Tickets_Overlay.pm
==============================================================================
--- rt/branches/3.5-TESTING/lib/RT/Tickets_Overlay.pm	(original)
+++ rt/branches/3.5-TESTING/lib/RT/Tickets_Overlay.pm	Thu May 25 21:15:05 2006
@@ -939,7 +939,7 @@
     # RT doesn't allow to add groups as members of the
     # ticket roles, so we just hide entries in CGM table
     # with MemberId == GroupId from results
-    my $groupmembers = $self->SUPER::Limit(
+    $self->SUPER::Limit(
         LEFTJOIN   => $groupmembers,
         FIELD      => 'GroupId',
         OPERATOR   => '!=',
@@ -1309,8 +1309,8 @@
     my $field = $rest{SUBKEY} || die "No field specified";
 
     # For our sanity, we can only limit on one queue at a time
-
-    my ($queue, $field, $cfid ) = $self->_CustomFieldDecipher( $field );
+    my ($queue, $cfid);
+    ($queue, $field, $cfid ) = $self->_CustomFieldDecipher( $field );
 
 # If we're trying to find custom fields that don't match something, we
 # want tickets where the custom field has no value at all.  Note that

Modified: rt/branches/3.5-TESTING/lib/t/regression/07rights.t
==============================================================================
--- rt/branches/3.5-TESTING/lib/t/regression/07rights.t	(original)
+++ rt/branches/3.5-TESTING/lib/t/regression/07rights.t	Thu May 25 21:15:05 2006
@@ -112,7 +112,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" );