Skip to content

Commit

Permalink
Panorama: fix linking nested business processes
Browse files Browse the repository at this point in the history
- fix hiding navigation when following nested BPs
- fix back link when following nested BPs
  • Loading branch information
sni committed Jul 23, 2024
1 parent 825dd5b commit 0d6c7f2
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
2 changes: 2 additions & 0 deletions Changes
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
6 changes: 3 additions & 3 deletions lib/Thruk/Action/AddDefaults.pm
Original file line number Diff line number Diff line change
Expand Up @@ -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'} || '';
Expand Down Expand Up @@ -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 || {};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<a class="button text-xs font-normal p-px m-0" href="#" onclick="bp_zoom_rel(-0.05)">-</a>
</div>
<div class="bp_back_link z-20 absolute top-1 left-2" style="display: none;">
<button class="iconOnly m-0" onclick="return(bp_details_link_clicked(event, this))"><i class="fa-solid fa-house leading-none"></i></button>
<a href="" class="button iconOnly m-0" onclick="return(bp_details_link_clicked(event, this))"><i class="fa-solid fa-house leading-none"></i></a>
</div>
<div class="relative w-full h-full z-10 overflow-auto">
<div id='zoom[% bp.id %]'>
Expand Down

0 comments on commit 0d6c7f2

Please sign in to comment.