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

Merge branch 'bugfix/disable-downtimes-for-child-hosts-w-icinga2-10774' 

refs #10744
This commit is contained in:
Eric Lippmann 2015-12-21 13:06:52 +01:00
parent 9f8ee4fb69 627680d500
commit 7bafab2c68
2 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/monitoring/application/controllers/HostController.php
View File

@ -153,6 +153,7 @@ class HostController extends MonitoredObjectController
$this->assertPermission('monitoring/command/downtime/schedule');
$form = new ScheduleHostDowntimeCommandForm();
$form->setBackend($this->backend);
$form->setTitle($this->translate('Schedule Host Downtime'));
$this->handleCommandForm($form);
}

21
modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php
View File

@ -20,8 +20,8 @@ class ScheduleHostDowntimeCommandForm extends ScheduleServiceDowntimeCommandForm
public function createElements(array $formData = array())
{
parent::createElements($formData);
$this->addElements(array(
array(
$this->addElement(
'checkbox',
'all_services',
array(
@ -31,8 +31,10 @@ class ScheduleHostDowntimeCommandForm extends ScheduleServiceDowntimeCommandForm
'label' => $this->translate('All Services'),
'value' => false
)
),
array(
);
if (substr($this->getBackend()->getProgramVersion(), 0, 2) !== 'v2') {
$this->addElement(
'select',
'child_hosts',
array(
@ -47,8 +49,9 @@ class ScheduleHostDowntimeCommandForm extends ScheduleServiceDowntimeCommandForm
),
'value' => 0
)
)
));
);
}
return $this;
}
@ -60,7 +63,11 @@ class ScheduleHostDowntimeCommandForm extends ScheduleServiceDowntimeCommandForm
{
foreach ($this->objects as $object) {
/** @var \Icinga\Module\Monitoring\Object\Host $object */
$childHosts = (int) $this->getElement('child_hosts')->getValue();
if (($childHostsEl = $this->getElement('child_hosts')) !== null) {
$childHosts = (int) $childHostsEl->getValue();
} else {
$childHosts = 0;
}
$allServices = $this->getElement('all_services')->isChecked();
if ($childHosts === 0) {
$hostDowntime = new ScheduleHostDowntimeCommand();