[Rt-commit] r6558 - in rt/branches/3.6-RELEASE: . lib/RT/Interface

[jesse at bestpractical.com]

Author: jesse
Date: Fri Dec  1 13:51:45 2006
New Revision: 6558

Modified:
   rt/branches/3.6-RELEASE/   (props changed)
   rt/branches/3.6-RELEASE/lib/RT/Interface/Web.pm
   rt/branches/3.6-RELEASE/lib/RT/SavedSearch.pm

Log:
 r45282 at pinglin (orig r6492):  clkao | 2006-11-22 04:44:13 -0500
 Move load_container_object into RT::SavedSearch.


Modified: rt/branches/3.6-RELEASE/lib/RT/Interface/Web.pm
==============================================================================
--- rt/branches/3.6-RELEASE/lib/RT/Interface/Web.pm	(original)
+++ rt/branches/3.6-RELEASE/lib/RT/Interface/Web.pm	Fri Dec  1 13:51:45 2006
@@ -1621,20 +1621,7 @@
 
 sub _load_container_object {
     my ($obj_type, $obj_id) = @_;
-    if ( $obj_type eq 'RT::User' && $obj_id == $session{'CurrentUser'}->Id)  {
-        return $session{'CurrentUser'}->UserObj;
-    }
-    elsif ($obj_type eq 'RT::Group') {
-        my $group = RT::Group->new($session{'CurrentUser'});
-        $group->Load($obj_id);
-        return $group;
-    }
-    elsif ($obj_type eq 'RT::System') {
-        # XXX: check hasright
-        return RT::System->new($session{'CurrentUser'});
-    }
-    else {
-    }
+    return RT::SavedSearch->new($self->CurrentUser)->_load_privacy_object($obj_type, $obj_id);
 }
 
 =head2 _parse_saved_search ( $arg );

Modified: rt/branches/3.6-RELEASE/lib/RT/SavedSearch.pm
==============================================================================
--- rt/branches/3.6-RELEASE/lib/RT/SavedSearch.pm	(original)
+++ rt/branches/3.6-RELEASE/lib/RT/SavedSearch.pm	Fri Dec  1 13:51:45 2006
@@ -276,6 +276,24 @@
 
 ### Internal methods
 
+sub _load_privacy_object {
+    my ($self, $obj_type, $obj_id) = @_;
+    if ( $obj_type eq 'RT::User' && $obj_id == $self->CurrentUser->Id)  {
+        return $self->CurrentUser->UserObj;
+    }
+    elsif ($obj_type eq 'RT::Group') {
+        my $group = RT::Group->new($self->CurrentUser);
+        $group->Load($obj_id);
+        return $group;
+    }
+    elsif ($obj_type eq 'RT::System') {
+        return RT::System->new($self->CurrentUser);
+    }
+
+    RT::Logger->error("Tried to load a search belonging to an $obj_type, which is neither a user nor a group");
+    return undef;
+}
+
 # _GetObject: helper routine to load the correct object whose parameters
 #  have been passed.
 
@@ -284,22 +302,14 @@
     my $privacy = shift;
 
     my ($obj_type, $obj_id) = split(/\-/, $privacy);
-    unless ($obj_type eq 'RT::User' || $obj_type eq 'RT::Group') {
-	$RT::Logger->error("Tried to load a search belonging to an $obj_type, which is neither a user nor a group");
-	return undef;
-    }
 
-    my $object;
-    eval "
-         require $obj_type;
-         \$object = $obj_type->new(\$self->CurrentUser);
-         \$object->Load(\$obj_id);
-    ";
+    my $object = $self->_load_privacy_object($obj_type, $obj_id);
+
     unless (ref($object) eq $obj_type) {
 	$RT::Logger->error("Could not load object of type $obj_type with ID $obj_id");
 	return undef;
     }
-    
+
     # Do not allow the loading of a user object other than the current
     # user, or of a group object of which the current user is not a member.