X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=rt%2Fshare%2Fhtml%2FWidgets%2FSavedSearch;h=3cb0f35a750f86f1add178d38c3be472b98709f7;hb=e9e0cf0989259b94d9758eceff448666a2e5a5cc;hp=fe75a75b386f23afc1ac4b48ab9050bcc9900301;hpb=0fb307c305e4bc2c9c27dc25a3308beae3a4d33c;p=freeside.git diff --git a/rt/share/html/Widgets/SavedSearch b/rt/share/html/Widgets/SavedSearch index fe75a75b3..3cb0f35a7 100644 --- 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-2014 Best Practical Solutions, LLC %# %# %# (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,9 +86,13 @@ 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 ) = @$_; + my ( $desc, $loc_desc, $search ) = @$_; use Data::Dumper; # FFS local $Data::Dumper::Sortkeys = 1;