tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-27 15:54:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

Don't show flexible twice for not yet started flexible downtimes

Browse Source
This commit is contained in:
Eric Lippmann 2019-07-11 14:20:32 +02:00
parent 0fb034b663
commit 037bcc4b3e
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/monitoring/application/views/scripts/show/components/downtime.phtml
View File

@ -61,18 +61,10 @@ if (empty($object->comments) && ! $addLink) {
$this->timeUntil($downtime->is_flexible ? $downtime->scheduled_end : $downtime->end, false, true) $this->timeUntil($downtime->is_flexible ? $downtime->scheduled_end : $downtime->end, false, true)
); );
} else { } else {
if ((bool) $downtime->is_fixed) {
$state = sprintf( $state = sprintf(
$this->translate('scheduled %s', 'Last format parameter represents the time scheduled'), $this->translate('scheduled %s', 'Last format parameter represents the time scheduled'),
$this->timeUntil($downtime->start, false, true) $this->timeUntil($downtime->start, false, true)
); ) . ' ' . sprintf(
} else {
$state = sprintf(
$this->translate('scheduled flexible %s', 'Last format parameter represents the time scheduled'),
$this->timeUntil($downtime->start, false, true)
);
}
$state .= ' ' . sprintf(
$this->translate('expires %s', 'Last format parameter represents the downtime expire time'), $this->translate('expires %s', 'Last format parameter represents the downtime expire time'),
$this->timeUntil($downtime->is_flexible ? $downtime->scheduled_end : $downtime->end, false, true) $this->timeUntil($downtime->is_flexible ? $downtime->scheduled_end : $downtime->end, false, true)
); );