tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-28 16:24:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Show expire time for flexbile downtimes where missing

Browse Source
This commit is contained in:
Eric Lippmann 2019-07-11 14:07:05 +02:00
parent 5145de6b50
commit b5bfd0c620
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/monitoring/application/views/scripts/partials/downtime/downtime-header.phtml
View File

@ -47,7 +47,7 @@
)) ?> )) ?>
</span> </span>
<?php if (! $downtime->is_in_effect && $downtime->start >= time()): ?> <?php if (! $downtime->is_in_effect && $downtime->start >= time()): ?>
<span><?= sprintf($this->translate('expires %s'), $this->timeUntil($downtime->end, false, true)) ?></span> <span><?= sprintf($this->translate('expires %s'), $this->timeUntil($downtime->is_flexible ? $downtime->scheduled_end : $downtime->end, false, true)) ?></span>
<?php endif ?> <?php endif ?>
<span class="comment-icons"> <span class="comment-icons">
<?php if ($downtime->is_flexible): ?> <?php if ($downtime->is_flexible): ?>

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

@ -74,7 +74,7 @@ if (empty($object->comments) && ! $addLink) {
} }
$state .= ' ' . sprintf( $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->end, false, true) $this->timeUntil($downtime->is_flexible ? $downtime->scheduled_end : $downtime->end, false, true)
); );
} }
} }