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

IcingaHost: fix tests

Browse Source
This commit is contained in:
Thomas Gelf 2016-10-25 00:30:12 +00:00
parent d804ebb321
commit ad7c5bc997
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/views/helpers/FormDataFilter.php
View File

@ -169,7 +169,7 @@ class Zend_View_Helper_FormDataFilter extends Zend_View_Helper_FormElement
} }
} }
if ($col === 'groups' && $dummy->supportsGroups()) { if (substr($col, -7) === '.groups' && $dummy->supportsGroups()) {
return $this->selectGroup($type, $filter); return $this->selectGroup($type, $filter);
} }
} }

2
library/Director/IcingaConfig/AssignRenderer.php
View File

@ -56,7 +56,7 @@ class AssignRenderer
protected function renderEquals($column, $expression) protected function renderEquals($column, $expression)
{ {
if ($column === 'groups') { if (substr($column, -7) === '.groups') {
return sprintf( return sprintf(
'%s in %s', '%s in %s',
$expression, $expression,

3
library/Director/Objects/IcingaHost.php
View File

@ -137,10 +137,9 @@ class IcingaHost extends IcingaObject
$properties = array(); $properties = array();
if (!empty($hostProperties)) { if (!empty($hostProperties)) {
$properties[$props] = $hostProperties; $properties[$props] = $hostProperties;
$properties[$props][$prefix . 'groups'] = 'Groups';
} }
$properties['groups'] = 'Groups';
if (!empty($hostVars)) { if (!empty($hostVars)) {
$properties[$vars] = $hostVars; $properties[$vars] = $hostVars;
} }

3
test/php/library/Director/Objects/IcingaHostTest.php
View File

@ -668,7 +668,8 @@ class IcingaHostTest extends BaseTestCase
"${prefix}notes_url" => "notes_url", "${prefix}notes_url" => "notes_url",
"${prefix}retry_interval" => "retry_interval", "${prefix}retry_interval" => "retry_interval",
"${prefix}volatile" => "volatile", "${prefix}volatile" => "volatile",
"${prefix}zone" => "zone" "${prefix}zone" => "zone",
"${prefix}groups" => "Groups"
); );
} }
protected function loadRendered($name) protected function loadRendered($name)