[Rt-commit] r11218 - rt/branches/3.8-TESTING/lib/RT

[ruz at bestpractical.com]

Author: ruz
Date: Wed Mar 26 21:13:21 2008
New Revision: 11218

Modified:
   rt/branches/3.8-TESTING/lib/RT/Handle.pm

Log:
* in ACLEquivGroupId handle situation when SystemUser is not there yet

Modified: rt/branches/3.8-TESTING/lib/RT/Handle.pm
==============================================================================
--- rt/branches/3.8-TESTING/lib/RT/Handle.pm	(original)
+++ rt/branches/3.8-TESTING/lib/RT/Handle.pm	Wed Mar 26 21:13:21 2008
@@ -941,12 +941,19 @@
 =cut
 
 sub ACLEquivGroupId {
-    my $username = shift;
-    my $user     = RT::User->new($RT::SystemUser);
-    $user->Load($username);
-    my $equiv_group = RT::Group->new($RT::SystemUser);
-    $equiv_group->LoadACLEquivalenceGroup($user);
-    return ( $equiv_group->Id );
+    my $id = shift;
+
+    my $cu = $RT::SystemUser;
+    unless ( $cu ) {
+        require RT::CurrentUser;
+        $cu = new RT::CurrentUser;
+        $cu->LoadByName('RT_System');
+        warn "Couldn't load RT_System user" unless $cu->id;
+    }
+
+    my $equiv_group = RT::Group->new( $cu );
+    $equiv_group->LoadACLEquivalenceGroup( $id );
+    return $equiv_group->Id;
 }
 
 eval "require RT::Handle_Vendor";