[Rt-commit] r7842 - in rt/branches/3.7-EXPERIMENTAL-TUNIS: lib/RT t/api

[clsung at bestpractical.com]

Author: clsung
Date: Sat May 12 12:36:01 2007
New Revision: 7842

Modified:
   rt/branches/3.7-EXPERIMENTAL-TUNIS/   (props changed)
   rt/branches/3.7-EXPERIMENTAL-TUNIS/lib/RT/CachedGroupMember_Overlay.pm
   rt/branches/3.7-EXPERIMENTAL-TUNIS/lib/RT/User_Overlay.pm
   rt/branches/3.7-EXPERIMENTAL-TUNIS/t/api/user.t

Log:
 r1049 at going04:  clsung | 2007-05-13 00:34:25 +0800
 - typo fix, 'Subgrouptest',$$ => 'Subgrouptest'.$$
 r1050 at going04:  clsung | 2007-05-13 00:35:18 +0800
 - fix warning if $self->id doesn't exist
 r1051 at going04:  clsung | 2007-05-13 00:36:06 +0800
 - fix warning, return {1} => return (1)


Modified: rt/branches/3.7-EXPERIMENTAL-TUNIS/lib/RT/CachedGroupMember_Overlay.pm
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL-TUNIS/lib/RT/CachedGroupMember_Overlay.pm	(original)
+++ rt/branches/3.7-EXPERIMENTAL-TUNIS/lib/RT/CachedGroupMember_Overlay.pm	Sat May 12 12:36:01 2007
@@ -260,7 +260,7 @@
     my $val = shift;
  
     # if it's already disabled, we're good.
-    return {1} if ($self->__Value('Disabled') == $val);
+    return (1) if ( $self->__Value('Disabled') == $val);
     my $err = $self->SUPER::SetDisabled($val);
     my ($retval, $msg) = $err->as_array();
     unless ($retval) {

Modified: rt/branches/3.7-EXPERIMENTAL-TUNIS/lib/RT/User_Overlay.pm
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL-TUNIS/lib/RT/User_Overlay.pm	(original)
+++ rt/branches/3.7-EXPERIMENTAL-TUNIS/lib/RT/User_Overlay.pm	Sat May 12 12:36:01 2007
@@ -575,7 +575,7 @@
     my $TempUser = RT::User->new($RT::SystemUser);
     $TempUser->LoadByEmail($Value);
 
-    if ( $TempUser->id && ( $TempUser->id != $self->id ) )
+    if ( $TempUser->id && ( !$self->id || $TempUser->id != $self->id ) )
     {    # if we found a user with that address
             # it's invalid to set this user's address to it
         return (undef);

Modified: rt/branches/3.7-EXPERIMENTAL-TUNIS/t/api/user.t
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL-TUNIS/t/api/user.t	(original)
+++ rt/branches/3.7-EXPERIMENTAL-TUNIS/t/api/user.t	Sat May 12 12:36:01 2007
@@ -186,7 +186,7 @@
 
 # Create a subgroup
 my $subgroup = RT::Group->new($RT::SystemUser);
-$subgroup->CreateUserDefinedGroup(Name => 'Subgrouptest',$$);
+$subgroup->CreateUserDefinedGroup(Name => 'Subgrouptest'.$$);
 ok($subgroup->Id, "Created a new group ".$subgroup->Id."Ok");
 #Add the subgroup as a subgroup of the group
 my ($said, $samsg) =  $group->AddMember($subgroup->PrincipalId);