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

NavigationItemRenderer: split actualLinkTarget() into getIcingaLinkTarget() and getHtmlLinkTarget() 

refs #10330
This commit is contained in:
Alexander A. Klimov 2015-12-17 16:13:12 +01:00
parent 5edd8df1b6
commit a9b818d52c
1 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
library/Icinga/Web/Navigation/Renderer/NavigationItemRenderer.php
View File

@ -200,7 +200,7 @@ class NavigationItemRenderer
$url->overwriteParams($item->getUrlParameters());
$target = $item->getTarget();
if ($url->isExternal() && ! ($target && $this->actualLinkTarget($target) === null)) {
if ($url->isExternal() && ! ($target && $this->getIcingaLinkTarget($target) === null)) {
$url = Url::fromPath('iframe', array('url' => $url));
}
@ -237,31 +237,43 @@ class NavigationItemRenderer
return '';
}
$actualTarget = $this->actualLinkTarget($target);
$actualTarget = $this->getIcingaLinkTarget($target);
if ($actualTarget !== null) {
return ' data-base-target="' . $actualTarget . '"';
}
$actualTarget = $this->actualLinkTarget($target, false);
$actualTarget = $this->getHtmlLinkTarget($target);
return ' target="' . ($actualTarget === null ? $this->view()->escape($target) : $actualTarget) . '"';
}
/**
* If $target is a linktarget, return its HTML version. Otherwise, return null.
* If $targetName is an internal link target, return its HTML version. Otherwise, return null.
*
* @param string $target
* @param bool $internal Whether the target must or must not be provided by Icinga Web 2
* @param string $targetName
*
* @return string|null
*/
protected function actualLinkTarget($target, $internal = true)
protected function getIcingaLinkTarget($targetName)
{
$linkTargets = $internal ? $this->internalLinkTargets : $this->htmlLinkTargets;
if (isset($linkTargets[$target])) {
return $linkTargets[$target];
if (isset($this->internalLinkTargets[$targetName])) {
return $this->internalLinkTargets[$targetName];
}
if (in_array($target, $linkTargets, true)) {
return $target;
if (in_array($targetName, $this->internalLinkTargets, true)) {
return $targetName;
}
}
/**
* If $targetName is an HTML link target, return its HTML version. Otherwise, return null.
*
* @param string $targetName
*
* @return string|null
*/
protected function getHtmlLinkTarget($targetName)
{
if (isset($this->htmlLinkTargets[$targetName])) {
return $this->htmlLinkTargets[$targetName];
}
}
}