tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-25 23:04:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

Action: Only create an Url object once macros are resolved

Browse Source 
refs #3829
This commit is contained in:
Johannes Meyer 2019-06-25 09:08:04 +02:00
parent a527a80c93
commit 3f2a2fa984
1 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,6 +7,7 @@ use Icinga\Data\Filter\Filter;
use Icinga\Web\Navigation\NavigationItem; use Icinga\Web\Navigation\NavigationItem;
use Icinga\Module\Monitoring\Object\Macro; use Icinga\Module\Monitoring\Object\Macro;
use Icinga\Module\Monitoring\Object\MonitoredObject; use Icinga\Module\Monitoring\Object\MonitoredObject;
use Icinga\Web\Url;
/** /**
* Action for monitored objects * Action for monitored objects
@ -34,6 +35,13 @@ class Action extends NavigationItem
*/ */
protected $filter; protected $filter;
/**
* This action's raw url attribute
*
* @var string
*/
protected $rawUrl;
/** /**
* Set this action's object * Set this action's object
* *
@ -80,14 +88,22 @@ class Action extends NavigationItem
return $this->filter; return $this->filter;
} }
/** public function setUrl($url)
* {@inheritdoc} {
*/ if (is_string($url)) {
$this->rawUrl = $url;
} else {
parent::setUrl($url);
}
return $this;
}
public function getUrl() public function getUrl()
{ {
$url = parent::getUrl(); $url = parent::getUrl();
if (! $this->resolved && $url !== null) { if (! $this->resolved && $url === null) {
$this->setUrl(Macro::resolveMacros($url->getAbsoluteUrl(), $this->getObject())); $this->setUrl(Url::fromPath(Macro::resolveMacros($this->rawUrl, $this->getObject())));
$this->resolved = true; $this->resolved = true;
return parent::getUrl(); return parent::getUrl();
} else { } else {
@ -95,9 +111,6 @@ class Action extends NavigationItem
} }
} }
/**
* {@inheritdoc}
*/
public function getRender() public function getRender()
{ {
if ($this->render === null) { if ($this->render === null) {