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

Services: fix multiselection for templates

This commit is contained in:
Thomas Gelf 2018-10-25 08:26:09 +02:00
parent 77cbb1040c
commit ef0499918f
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/controllers/ServicesController.php
View File

@ -7,6 +7,8 @@ use Icinga\Module\Director\Web\Controller\ObjectsController;
class ServicesController extends ObjectsController
{
protected $multiEdit = array(
'imports',
'groups',
'disabled'
);
}

10
library/Director/Web/Controller/ObjectsController.php
View File

@ -322,7 +322,15 @@ abstract class ObjectsController extends ActionController
if ($ex->isExpression()) {
if ($col === 'name') {
$name = $ex->getExpression();
$objects[$name] = IcingaObject::loadByType($type, $name, $db);
if ($type === 'service') {
$key = [
'object_type' => 'template',
'object_name' => $name
];
} else {
$key = $name;
}
$objects[$name] = IcingaObject::loadByType($type, $key, $db);
} elseif ($col === 'id') {
$name = $ex->getExpression();
$objects[$name] = IcingaObject::loadByType($type, ['id' => $name], $db);