tyler.durden/icingaweb2-module-director
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2-module-director.git synced 2025-07-28 16:24:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

ObjectPreview: link related objects

Browse Source 
fixes #1521
This commit is contained in:
Thomas Gelf 2018-06-12 21:21:32 +02:00
parent 9a259d1589
commit f91c6f211d
2 changed files with 71 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/82-Changelog.md
View File

@ -38,6 +38,7 @@ before switching to a new version.
* FEATURE: Inspect feature got refactored, also for Services (#264, #689, #1396, #1397) * FEATURE: Inspect feature got refactored, also for Services (#264, #689, #1396, #1397)
* FEATURE: The "Modify" hook is now available for Services (#689), regardless * FEATURE: The "Modify" hook is now available for Services (#689), regardless
of whether they have been directly assigned, inherited or applied of whether they have been directly assigned, inherited or applied
* FEATURE: Config preview links imports, hosts and commands to related objects (#1521)
* FIX: Don't suggest Command templates where Commands are required (#1414) * FIX: Don't suggest Command templates where Commands are required (#1414)
* FIX: Do not allow to delete Commands being used by other objects (#1443) * FIX: Do not allow to delete Commands being used by other objects (#1443)
* FIX: Show 'Inspect' tab only for Endpoints with an ApiUser (#1293) * FIX: Show 'Inspect' tab only for Endpoints with an ApiUser (#1293)

71
library/Director/Web/ObjectPreview.php
View File

@ -2,6 +2,7 @@
namespace Icinga\Module\Director\Web; namespace Icinga\Module\Director\Web;
use dipl\Html\Text;
use Icinga\Module\Director\Exception\NestingError; use Icinga\Module\Director\Exception\NestingError;
use Icinga\Module\Director\Objects\IcingaObject; use Icinga\Module\Director\Objects\IcingaObject;
use Icinga\Web\Request; use Icinga\Web\Request;
@ -99,7 +100,75 @@ class ObjectPreview
$classes[] = 'logfile'; $classes[] = 'logfile';
} }
$content->add(Html::tag('pre', ['class' => $classes], $file->getContent())); $plain = Html::wantHtml($file->getContent())->render();
$plain = preg_replace_callback(
'/^(\s+import\s+\&quot\;)(.+)(\&quot\;)/m',
[$this, 'linkImport'],
$plain
);
$plain = preg_replace_callback(
'/^(\s+(?:check_|event_)?command\s+=\s+\&quot\;)(.+)(\&quot\;)/m',
[$this, 'linkCommand'],
$plain
);
$plain = preg_replace_callback(
'/^(\s+host_name\s+=\s+\&quot\;)(.+)(\&quot\;)/m',
[$this, 'linkHost'],
$plain
);
$text = Text::create($plain)->setEscaped();
$content->add(Html::tag('pre', ['class' => $classes], $text));
} }
} }
/**
* @api internal
* @param $match
* @return string
*/
public function linkImport($match)
{
$blacklist = [
'plugin-notification-command',
'plugin-check-command',
];
if (in_array($match[2], $blacklist)) {
return $match[1] . $match[2] . $match[3];
}
return $match[1] . Link::create(
$match[2],
sprintf('director/' . $this->object->getShortTableName()),
['name' => $match[2]]
)->render() . $match[3];
}
/**
* @api internal
* @param $match
* @return string
*/
public function linkCommand($match)
{
return $match[1] . Link::create(
$match[2],
sprintf('director/command'),
['name' => $match[2]]
)->render() . $match[3];
}
/**
* @api internal
* @param $match
* @return string
*/
public function linkHost($match)
{
return $match[1] . Link::create(
$match[2],
sprintf('director/host'),
['name' => $match[2]]
)->render() . $match[3];
}
} }