From e96c6958b28973f7e8c349c60a50a561d047ace1 Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Tue, 16 Jun 2015 16:36:13 +0200 Subject: [PATCH] MonitoredObjectController: Show the service tab, if it was already shown --- .../Web/Controller/MonitoredObjectController.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php b/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php index a9d05e8fa..0b1cda923 100644 --- a/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php +++ b/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php @@ -145,6 +145,9 @@ abstract class MonitoredObjectController extends Controller $params = array( 'host' => $object->getName() ); + if ($this->params->has('service')) { + $params['service'] = $this->params->get('service'); + } } else { $isService = true; $params = array( @@ -165,14 +168,14 @@ abstract class MonitoredObjectController extends Controller 'urlParams' => $params ) ); - if ($isService) { + if ($isService || $this->params->has('service')) { $tabs->add( 'service', array( 'title' => sprintf( $this->translate('Show detailed information for service %s on host %s'), - $object->getName(), - $object->getHost()->getName() + $isService ? $object->getName() : $this->params->get('service'), + $isService ? $object->getHost()->getName() : $object->getName() ), 'label' => $this->translate('Service'), 'icon' => 'service',