From 1317a6eaf8c5000652ea181e362f89d416cbed30 Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Wed, 26 Aug 2015 10:55:18 +0200 Subject: [PATCH] Show an object's instance only if there are multiple instances refs #9945 --- .../application/views/scripts/show/components/command.phtml | 2 ++ .../Monitoring/Web/Controller/MonitoredObjectController.php | 1 + 2 files changed, 3 insertions(+) diff --git a/modules/monitoring/application/views/scripts/show/components/command.phtml b/modules/monitoring/application/views/scripts/show/components/command.phtml index 432261bc1..2ec232ce3 100644 --- a/modules/monitoring/application/views/scripts/show/components/command.phtml +++ b/modules/monitoring/application/views/scripts/show/components/command.phtml @@ -5,10 +5,12 @@ $command = array_shift($parts); ?> + translate('Instance'); ?> escape($object->instance_name); ?> + translate('Command'); ?> diff --git a/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php b/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php index 7b8785a9c..5ccadf5a6 100644 --- a/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php +++ b/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php @@ -91,6 +91,7 @@ abstract class MonitoredObjectController extends Controller $delDowntimeForm->handleRequest(); $this->view->delDowntimeForm = $delDowntimeForm; } + $this->view->showInstance = $this->backend->select()->from('instance')->count() > 1; $this->view->object = $this->object; }