tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Action: Return the new url if it has been resolved 

This was already part of the 2.0 release, but was working however. Got
revealed by a restructuring commit a few weeks ago.

fixes #10702
This commit is contained in:
Johannes Meyer 2015-11-23 10:34:46 +01:00
parent 6725d6fa9d
commit 7c6471da86
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/monitoring/library/Monitoring/Web/Navigation/Action.php
View File

@ -89,9 +89,10 @@ class Action extends NavigationItem
if (! $this->resolved && $url !== null) { if (! $this->resolved && $url !== null) {
$this->setUrl(Macro::resolveMacros($url->getAbsoluteUrl(), $this->getObject())); $this->setUrl(Macro::resolveMacros($url->getAbsoluteUrl(), $this->getObject()));
$this->resolved = true; $this->resolved = true;
return parent::getUrl();
} else {
return $url;
} }
return $url;
} }
/** /**