Merge branch '5.0/fix-ticket-graph-saved-search' into 5.0-trunk

bestpractical · Nov 17, 2023 · 6809d3f · 6809d3f
2 parents 19d55bf + 5fe30cf
commit 6809d3f
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/lib/RT/Interface/Web.pm b/lib/RT/Interface/Web.pm
@@ -2051,6 +2051,10 @@ sub ExpandShortenerCode {
                     if ( $type eq 'Chart' ) {
                         $content->{SavedChartSearchId} = $id;
                     }
+                    elsif ( $type eq 'Graph' ) {
+                        $content->{SavedSearchId} = $id;
+                        $content->{SearchType} = 'Graph';
+                    }
                     else {
                         $content->{SavedSearchId} = $id;
                         $content->{Class}         = "RT::${type}s";

diff --git a/lib/RT/Interface/Web/MenuBuilder.pm b/lib/RT/Interface/Web/MenuBuilder.pm
@@ -575,6 +575,7 @@ sub BuildMainNav {
         (
                $request_path =~ m{^/(?:Ticket|Transaction|Search)/}
             && $request_path !~ m{^/Search/Simple\.html}
+            && ($HTML::Mason::Commands::DECODED_ARGS->{SearchType} // '') ne 'Graph'
         )
         || (   $request_path =~ m{^/Search/Simple\.html}
             && $HTML::Mason::Commands::DECODED_ARGS->{'q'} )

diff --git a/share/html/Search/Elements/EditSearches b/share/html/Search/Elements/EditSearches
@@ -100,7 +100,7 @@
     <div class="label col-4"><&|/l&>Permalink</&>:</div>
     <div class="col-8">
       <span class="form-control current-value">
-        <a href="<% $m->request_path %>?sc=<% $saved_search->ShortenerObj->Code %>" class="permalink" data-toggle="tooltip" data-original-title="<% loc('Permalink to this saved search') %>" data-code="<% $saved_search->ShortenerObj->Code %>" data-url="<% $m->request_path %>?sc=<% $saved_search->ShortenerObj->Code %>"><% loc('View') %></a>
+        <a href="<% $m->request_path %>?sc=<% $saved_search->ShortenerObj->Code %>" class="permalink" data-toggle="tooltip" data-original-title="<% loc('Permalink to this saved search') %>" data-code="<% $saved_search->ShortenerObj->Code %>" data-url="<% $m->request_path %>?sc=<% $saved_search->ShortenerObj->Code %><% ($saved_search->Type // '') eq 'Graph' ? "&id=$DECODED_ARGS->{id}" : '' %>"><% loc('View') %></a>
       </span>
     </div>
   </div>

diff --git a/share/html/Ticket/Graphs/index.html b/share/html/Ticket/Graphs/index.html
@@ -86,7 +86,7 @@
 
 my @results;
 
-my @save_arguments = qw(id Direction LeadingLink ShowLinks MaxDepth FillUsing ShowLinkDescriptions);
+my @save_arguments = qw(Direction LeadingLink ShowLinks MaxDepth FillUsing ShowLinkDescriptions);
 foreach my $level ( 0 .. 6 ) {
     push @save_arguments, "Level-". $level ."-Properties";
 }
@@ -96,6 +96,7 @@
     Query        => \%ARGS,
     SavedSearch  => $saved_search,
     SearchFields => \@save_arguments,
+    Type         => 'Graph',
 );
 
 $ARGS{'LeadingLink'} ||= 'Members';