[Rt-commit] rt branch, 4.4-trunk, updated. rt-4.4.4-201-g181ce8e91e

[? sunnavy]

The branch, 4.4-trunk has been updated
       via  181ce8e91ed126aa4a7e4e5d14460ebf75c4cb79 (commit)
       via  77f60c16026f8d1e06fc4627afc42425f690c975 (commit)
      from  dded56f87f43104bd40e48c6469112a2326b8c76 (commit)

Summary of changes:
 share/html/Elements/ShowSearch | 4 ++++
 1 file changed, 4 insertions(+)

- Log -----------------------------------------------------------------
commit 77f60c16026f8d1e06fc4627afc42425f690c975
Author: craig kaiser <craig at bestpractical.com>
Date:   Thu Jun 18 09:24:30 2020 -0400

    Pass SavedChartSearchId from chart portlet
    
    If this value is not passed the context of the saved chart will not be
    there and the "Update" button will not be present on the chart.html
    page.

diff --git a/share/html/Elements/ShowSearch b/share/html/Elements/ShowSearch
index 8e415f6362..a047c4b966 100644
--- a/share/html/Elements/ShowSearch
+++ b/share/html/Elements/ShowSearch
@@ -78,6 +78,10 @@ if ($SavedSearch) {
     $SearchArg->{'SearchType'} ||= 'Ticket';
     if ( $SearchArg->{SearchType} ne 'Ticket' ) {
 
+        if ( $SearchArg->{'SearchType'} eq 'Chart' ) {
+            $SearchArg->{'SavedChartSearchId'} ||= $SavedSearch;
+        }
+
         # XXX: dispatch to different handler here
         $query_display_component
             = '/Search/Elements/' . $SearchArg->{SearchType};

commit 181ce8e91ed126aa4a7e4e5d14460ebf75c4cb79
Merge: dded56f87f 77f60c1602
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Sat Jan 16 05:11:54 2021 +0800

    Merge branch '4.4/keep-saved-chart-context' into 4.4-trunk


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