starting to work...

[freeside.git] / rt / share / html / Widgets / SavedSearch

diff --git a/rt/share/html/Widgets/SavedSearch b/rt/share/html/Widgets/SavedSearch
index fe75a75..5d3a828 100644 (file)
--- a/rt/share/html/Widgets/SavedSearch
+++ b/rt/share/html/Widgets/SavedSearch
@@ -2,7 +2,7 @@
 %#
 %# COPYRIGHT:
 %#
-%# This software is Copyright (c) 1996-2011 Best Practical Solutions, LLC
+%# This software is Copyright (c) 1996-2012 Best Practical Solutions, LLC
 %#                                          <sales@bestpractical.com>
 %#
 %# (Except where explicitly superseded by other copyright notices)
@@ -55,10 +55,6 @@ return \%ARGS;
 
 <%init>
 my @actions;
-my @Objects = RT::SavedSearches->new( $session{CurrentUser} )->_PrivacyObjects;
-push @Objects, RT::System->new($session{'CurrentUser'})
-    if $session{'CurrentUser'}->HasRight( Object=> $RT::System,
-                                          Right => 'SuperUser' );
 $self->{SearchId} ||= $args->{'SavedChartSearchId'} || 'new';
 
 my $SearchParams = { map { $_ => $args->{$_} } @{$self->{SearchFields}} };
@@ -90,6 +86,10 @@ if ( my ( $container_object, $search_id ) = _parse_saved_search(
 
 # look for the current one in the available saved searches
 if ($self->{SearchId} eq 'new') {
+    my @Objects = RT::SavedSearch->new( $session{CurrentUser} )->ObjectsForLoading;
+    push @Objects, RT::System->new($session{'CurrentUser'})
+        if $session{'CurrentUser'}->HasRight( Object=> $RT::System,
+                                              Right => 'SuperUser' );
     for my $obj (@Objects) {
         for ( $m->comp( "/Search/Elements/SearchesForObject", Object => $obj ) ) {
             my ( $desc, $search ) = @$_;