From 0d6c7f271e4026b37bb0af29d6ecd5351f839a5b Mon Sep 17 00:00:00 2001 From: Sven Nierlein Date: Tue, 23 Jul 2024 11:27:15 +0200 Subject: [PATCH] Panorama: fix linking nested business processes - fix hiding navigation when following nested BPs - fix back link when following nested BPs --- Changes | 2 ++ lib/Thruk/Action/AddDefaults.pm | 6 +++--- .../business_process/templates/_bp_graph.tt | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Changes b/Changes index 118665ea23..4a39f1d504 100644 --- a/Changes +++ b/Changes @@ -5,6 +5,8 @@ next: - Config Tool: - fix validating service parents (#1376) - enable list wizard for host/service depenencies (#1358) + - Panorama: + - fix linking nested business processes 3.16 Fri Jul 12 16:23:37 CEST 2024 - fix using unescaped url in reports (CVE-2024-39915) diff --git a/lib/Thruk/Action/AddDefaults.pm b/lib/Thruk/Action/AddDefaults.pm index e7c3980eed..1dcff3a8a0 100644 --- a/lib/Thruk/Action/AddDefaults.pm +++ b/lib/Thruk/Action/AddDefaults.pm @@ -102,7 +102,9 @@ sub begin { } # hide navigation - $c->stash->{show_nav} = (defined $c->req->parameters->{'nav'} && $c->req->parameters->{'nav'} eq '0') ? 0 : 1; + $c->stash->{'show_nav'} = (defined $c->req->parameters->{'nav'} && $c->req->parameters->{'nav'} eq '0') ? 0 : 1; + $c->stash->{'iframed'} = $c->req->parameters->{'iframed'} || 0; + $c->stash->{'show_nav'} = 0 if $c->stash->{'iframed'}; # minmal custom monitor screen $c->stash->{minimal} = $c->req->parameters->{'minimal'} || ''; @@ -131,8 +133,6 @@ sub begin { $c->stash->{'target'} = '_parent'; } - $c->stash->{'iframed'} = $c->req->parameters->{'iframed'} || 0; - # additional views on status pages $c->stash->{'additional_views'} = $Thruk::Globals::additional_views || {}; diff --git a/plugins/plugins-available/business_process/templates/_bp_graph.tt b/plugins/plugins-available/business_process/templates/_bp_graph.tt index 5d320be278..a0bb617b3c 100644 --- a/plugins/plugins-available/business_process/templates/_bp_graph.tt +++ b/plugins/plugins-available/business_process/templates/_bp_graph.tt @@ -10,7 +10,7 @@ -