From a7cf3d0eb2b190bf7864bffb12d75ba6868d8446 Mon Sep 17 00:00:00 2001 From: Eric Lippmann Date: Fri, 4 Sep 2015 15:48:45 +0200 Subject: [PATCH] monitoring/detail: Read "Next update" instead of "Next check" if the host or service is not active checked refs #8378 --- .../show/components/checkstatistics.phtml | 70 +++++++++---------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml b/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml index d2b08b6b7..fb6a575c0 100644 --- a/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml +++ b/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml @@ -15,41 +15,41 @@ - translate('Next check') ?> - - hasPermission('monitoring/command/schedule-check')) { - if ($object->getType() === $object::TYPE_SERVICE) { - echo $this->qlink( - $this->translate('Reschedule'), - 'monitoring/service/reschedule-check', - array('host' => $object->getHost()->getName(), 'service' => $object->getName()), - array( - 'icon' => 'reschedule', - 'data-base-target' => '_self', - 'title' => $this->translate( - 'Schedule the next active check at a different time than the current one' - ) - ) - ); - } else { - echo $this->qlink( - $this->translate('Reschedule'), - 'monitoring/host/reschedule-check', - array('host' => $object->getName()), - array( - 'icon' => 'reschedule', - 'data-base-target' => '_self', - 'title' => $this->translate( - 'Schedule the next active check at a different time than the current one' - ) - ) - ); - } - } ?> - state !== 99) { - echo $this->timeUntil($object->next_check); - } ?> - + active_checks_enabled ? $this->translate('Next check') : $this->translate('Next update') ?> + + hasPermission('monitoring/command/schedule-check')) { + if ($object->getType() === $object::TYPE_SERVICE) { + echo $this->qlink( + $this->translate('Reschedule'), + 'monitoring/service/reschedule-check', + array('host' => $object->getHost()->getName(), 'service' => $object->getName()), + array( + 'icon' => 'reschedule', + 'data-base-target' => '_self', + 'title' => $this->translate( + 'Schedule the next active check at a different time than the current one' + ) + ) + ); + } else { + echo $this->qlink( + $this->translate('Reschedule'), + 'monitoring/host/reschedule-check', + array('host' => $object->getName()), + array( + 'icon' => 'reschedule', + 'data-base-target' => '_self', + 'title' => $this->translate( + 'Schedule the next active check at a different time than the current one' + ) + ) + ); + } + } ?> + state !== 99) { + echo $this->timeUntil($object->next_check); + } ?> +