[Rt-commit] rt branch, 5.0/saved-search-keep-chart-context, created. rt-5.0.0beta1-1-gd30d2a5e8c

[Craig Kaiser]

The branch, 5.0/saved-search-keep-chart-context has been created
        at  d30d2a5e8c4fea6434f54669b282f72e9863b3bf (commit)

- Log -----------------------------------------------------------------
commit d30d2a5e8c4fea6434f54669b282f72e9863b3bf
Author: craig kaiser <craig at bestpractical.com>
Date:   Fri May 29 15:46:50 2020 -0400

    When following the link of a saved search chart provide SavedChartSearchId arg
    
    When editing a saved search of type 'Chart' the context of editing a
    saved search will be lost unless 'SavedChartSearchId' is passed.

diff --git a/share/html/Elements/ShowSearch b/share/html/Elements/ShowSearch
index 73328184e1..a7f136c14c 100644
--- a/share/html/Elements/ShowSearch
+++ b/share/html/Elements/ShowSearch
@@ -78,8 +78,14 @@ if ($SavedSearch) {
         $m->out(loc("Saved search [_1] not found", $m->interp->apply_escapes($SavedSearch, 'h'))) unless $IgnoreMissing;
         return;
     }
-    $SearchArg->{'SavedSearchId'} ||= $SavedSearch;
-    $SearchArg->{'SearchType'} ||= 'Ticket';
+    if ( $SearchArg->{'SearchType'} && $SearchArg->{'SearchType'} eq 'Chart' ) {
+        $SearchArg->{'SavedSearchId'} ||= $SavedSearch;
+        $SearchArg->{'SavedChartSearchId'} ||= $SavedSearch;
+    }
+    else {
+        $SearchArg->{'SavedSearchId'} ||= $SavedSearch;
+        $SearchArg->{'SearchType'} ||= 'Ticket';
+    }
     if ( $SearchArg->{SearchType} eq 'Transaction' ) {
         $class = $SearchArg->{Class} = 'RT::Transactions';
         $customize

-----------------------------------------------------------------------