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 5d3a828..d029203 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-2012 Best Practical Solutions, LLC
+%# This software is Copyright (c) 1996-2016 Best Practical Solutions, LLC
 %#                                          <sales@bestpractical.com>
 %#
 %# (Except where explicitly superseded by other copyright notices)
@@ -61,7 +61,8 @@ 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'};
@@ -92,7 +93,7 @@ if ($self->{SearchId} eq 'new') {
                                               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;