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

IcingaObject: a bunch of timeperiod-related fixes

This commit is contained in:
Thomas Gelf 2016-03-17 23:08:57 +01:00
parent 81e97853c4
commit 8680f04532
1 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
library/Director/Objects/IcingaObject.php
View File

@ -401,6 +401,17 @@ abstract class IcingaObject extends DbObject implements IcingaConfigRenderer
return parent::set($key, $value);
}
protected function setRanges($ranges)
{
$this->ranges()->set((array) $ranges);
return $this;
}
protected function getRanges()
{
return $this->ranges()->getValues();
}
protected function normalizeBoolean($value)
{
if ($value === 'y' || $value === '1' || $value === true || $value === 1) {
@ -1526,10 +1537,18 @@ abstract class IcingaObject extends DbObject implements IcingaConfigRenderer
}
}
if ($this->supportsRanges()) {
// TODO: resolve
$props['ranges'] = $this->get('ranges');
}
if ($skipDefaults) {
if (empty($props['imports'])) {
unset($props['imports']);
foreach (array('imports', 'ranges', 'arguments') as $key) {
if (empty($props[$key])) {
unset($props[$key]);
}
}
if (array_key_exists('vars', $props)) {
if (count((array) $props['vars']) === 0) {
unset($props['vars']);
@ -1658,6 +1677,13 @@ abstract class IcingaObject extends DbObject implements IcingaConfigRenderer
}
}
if ($this->supportsRanges()) {
$ranges = $this->ranges()->getOriginalValues();
if (!empty($ranges)) {
$props['ranges'] = $ranges;
}
}
foreach ($this->relatedSets() as $property => $set) {
if ($set->isEmpty()) {
continue;