rt 4.2.13 ticket#13852

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

diff --git a/rt/share/html/Widgets/SavedSearch b/rt/share/html/Widgets/SavedSearch
index d3348b3..d029203 100644 (file)
--- a/rt/share/html/Widgets/SavedSearch
+++ b/rt/share/html/Widgets/SavedSearch
@@ -1,40 +1,40 @@
 %# BEGIN BPS TAGGED BLOCK {{{
-%# 
+%#
 %# COPYRIGHT:
-%# 
-%# This software is Copyright (c) 1996-2009 Best Practical Solutions, LLC
-%#                                          <jesse@bestpractical.com>
-%# 
+%#
+%# This software is Copyright (c) 1996-2016 Best Practical Solutions, LLC
+%#                                          <sales@bestpractical.com>
+%#
 %# (Except where explicitly superseded by other copyright notices)
-%# 
-%# 
+%#
+%#
 %# LICENSE:
-%# 
+%#
 %# This work is made available to you under the terms of Version 2 of
 %# the GNU General Public License. A copy of that license should have
 %# been provided with this software, but in any event can be snarfed
 %# from www.gnu.org.
-%# 
+%#
 %# This work is distributed in the hope that it will be useful, but
 %# WITHOUT ANY WARRANTY; without even the implied warranty of
 %# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 %# General Public License for more details.
-%# 
+%#
 %# You should have received a copy of the GNU General Public License
 %# along with this program; if not, write to the Free Software
 %# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 %# 02110-1301 or visit their web page on the internet at
 %# http://www.gnu.org/licenses/old-licenses/gpl-2.0.html.
-%# 
-%# 
+%#
+%#
 %# CONTRIBUTION SUBMISSION POLICY:
-%# 
+%#
 %# (The following paragraph is not intended to limit the rights granted
 %# to you to modify and distribute this software under the terms of
 %# the GNU General Public License and is only of importance to you if
 %# you choose to contribute your changes and enhancements to the
 %# community by submitting them to Best Practical Solutions, LLC.)
-%# 
+%#
 %# By intentionally submitting any modifications, corrections or
 %# derivatives to this work, or any other work intended for use with
 %# Request Tracker, to Best Practical Solutions, LLC, you confirm that
@@ -43,7 +43,7 @@
 %# royalty-free, perpetual, license to use, copy, create derivative
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
-%# 
+%#
 %# END BPS TAGGED BLOCK }}}
 <%method new>
 <%init>
@@ -55,22 +55,19 @@ 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}} };
 
 if ( my ( $container_object, $search_id ) = _parse_saved_search(
             $args->{'SavedSearchLoad'} || $args->{'SavedChartSearchId'} ) ) {
-    my $search = $container_object->Attributes->WithId($search_id);
+    my $search = RT::Attribute->new( $session{'CurrentUser'} );
+    $search->Load($search_id);
     # We have a $search and now; import the others
     $self->{SearchId} = $args->{'SavedSearchLoad'} ||
         $args->{'SavedChartSearchId'};
     $self->{CurrentSearch}{Object} = $search;
-    if ( $args->{'SaveSearchLoad'} ) {
+    if ( $args->{'SavedSearchLoad'} ) {
         for ( @{ $self->{SearchFields} } ) {
             $args->{$_} = $search->SubValue($_) 
         }
@@ -90,9 +87,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;
@@ -110,7 +111,7 @@ if ( $args->{SavedSearchSave} ) {
         # rename
         $search->SetDescription( $args->{SavedSearchDescription} );
         $search->SetSubValues(%$SearchParams);
-           push @actions, loc( '[_1] [_2] updated.', loc($self->{SearchType}), $args->{SavedSearchDescription} );
+        push @actions, loc( '[_1] [_2] updated.', loc($self->{SearchType}), $args->{SavedSearchDescription} );
     }
     else {
         # new saved search
@@ -122,7 +123,7 @@ if ( $args->{SavedSearchSave} ) {
             SearchParams => $SearchParams
         );
         if ($ok) {
-               $self->{CurrentSearch}{Object} = $saved_search->{Attribute};
+            $self->{CurrentSearch}{Object} = $saved_search->{Attribute};
             $self->{SearchId} = $args->{SavedChartSearchId} = 'RT::User-' .
                 $session{CurrentUser}->id . '-SavedSearch-' .
                 $saved_search->Id;