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

Monitoring/Schedule Downtime: Fix form always creating type flexible

This commit is contained in:
Eric Lippmann 2013-10-20 15:55:08 +02:00
parent 235ab3f5f1
commit 33ecaaa52b
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/monitoring/application/forms/Command/ScheduleDowntimeForm.php
View File

@ -102,16 +102,14 @@ class ScheduleDowntimeForm extends WithChildrenCommandForm
$options = array(
'0' => 'No Triggered Downtime'
);
$dateFormat = $this->getView()->dateFormat();
foreach ($downtimes as $downtime) {
$dt = DateTimeFactory::create($downtime->downtime_scheduled_start_time);
$date_format = $preferences->get('app.dateFormat', $cfg->get('app.dateFormat', 'd/m/Y'));
$time_format = $preferences->get('app.timeFormat', $cfg->get('app.timeFormat', 'g:i A'));
$label = sprintf(
'ID %s: %s%s Starting @ %s',
$downtime->downtime_internal_downtime_id,
$downtime->host_name,
!empty($downtime->service_description) ? ' (' . $downtime->service_description . ')' : '',
$dt->format($date_format . ' ' . $time_format)
$dateFormat->formatDateTime($downtime->downtime_scheduled_start_time)
);
$options[$downtime->downtime_internal_downtime_id] = $label;
}
@ -170,6 +168,7 @@ class ScheduleDowntimeForm extends WithChildrenCommandForm
);
$now = DateTimeFactory::create();
$this->addElement(
new DateTimePicker(
array(
@ -338,10 +337,11 @@ class ScheduleDowntimeForm extends WithChildrenCommandForm
$this->getRequest()->getUser()->getUsername(),
$this->getValue('comment')
),
$this->getValue('type') === self::TYPE_FLEXIBLE,
$this->getValue('type') === self::TYPE_FIXED,
$this->getValue('hours') * 3600 + $this->getValue('minutes') * 60,
$this->getValue('triggered')
);
return $command->includeChildren(
$this->getWithChildren(),
$this->getValue('childobjects') === 1