From 5aa9738b55b01ae3a04eaf4b3e7e4846ec35c6fb Mon Sep 17 00:00:00 2001 From: Eric Lippmann Date: Wed, 27 May 2015 10:44:52 +0200 Subject: [PATCH 01/17] Translate no permission for configuration error message refs #6339 --- application/controllers/ConfigController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/controllers/ConfigController.php b/application/controllers/ConfigController.php index 77b5b66d9..8df6620c2 100644 --- a/application/controllers/ConfigController.php +++ b/application/controllers/ConfigController.php @@ -85,7 +85,7 @@ class ConfigController extends Controller public function indexAction() { if ($this->firstAllowedAction === null) { - throw new SecurityException('No permission for configuration'); + throw new SecurityException($this->translate('No permission for configuration')); } $action = $this->getTabs()->get($this->firstAllowedAction); if (substr($action->getUrl()->getPath(), 0, 7) === 'config/') { From d8097d4a160bf416f1beb1a5eec33b796247eea1 Mon Sep 17 00:00:00 2001 From: Eric Lippmann Date: Wed, 27 May 2015 10:46:20 +0200 Subject: [PATCH 02/17] Add missing return argument when removing an auth backend fails --- application/controllers/ConfigController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/controllers/ConfigController.php b/application/controllers/ConfigController.php index 8df6620c2..0606f8661 100644 --- a/application/controllers/ConfigController.php +++ b/application/controllers/ConfigController.php @@ -271,7 +271,7 @@ class ConfigController extends Controller $configForm->remove($authBackend); } catch (InvalidArgumentException $e) { Notification::error($e->getMessage()); - return; + return false; } if ($configForm->save()) { From ee5cc63fbca492370a6817a12a831d461d6f5717 Mon Sep 17 00:00:00 2001 From: Eric Lippmann Date: Wed, 27 May 2015 10:48:27 +0200 Subject: [PATCH 03/17] Add missing return argument when removing a resource fails --- application/controllers/ConfigController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/controllers/ConfigController.php b/application/controllers/ConfigController.php index 0606f8661..5df2be008 100644 --- a/application/controllers/ConfigController.php +++ b/application/controllers/ConfigController.php @@ -352,7 +352,7 @@ class ConfigController extends Controller $configForm->remove($resource); } catch (InvalidArgumentException $e) { Notification::error($e->getMessage()); - return; + return false; } if ($configForm->save()) { From ba8d7e0afd67aa5459b9112cb47a4777b1a85477 Mon Sep 17 00:00:00 2001 From: Eric Lippmann Date: Wed, 27 May 2015 10:49:34 +0200 Subject: [PATCH 04/17] Use Controller::translate() instead of just t() refs #7330 --- application/controllers/DashboardController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/controllers/DashboardController.php b/application/controllers/DashboardController.php index 325556be0..7e4ac479b 100644 --- a/application/controllers/DashboardController.php +++ b/application/controllers/DashboardController.php @@ -78,7 +78,7 @@ class DashboardController extends ActionController $dashboard = $this->dashboard; $form = new DashletForm(); $form->setDashboard($dashboard); - $form->setSubmitLabel(t('Update Dashlet')); + $form->setSubmitLabel($this->translate('Update Dashlet')); if (! $this->_request->getParam('pane')) { throw new Zend_Controller_Action_Exception( 'Missing parameter "pane"', From 49f89ee505cc977c439ccea457cffd200f6737e6 Mon Sep 17 00:00:00 2001 From: Eric Lippmann Date: Wed, 27 May 2015 10:59:35 +0200 Subject: [PATCH 05/17] Add missing return argument in the ResourceConfigForm --- application/forms/Config/ResourceConfigForm.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/forms/Config/ResourceConfigForm.php b/application/forms/Config/ResourceConfigForm.php index 5d1eeaa9b..bfec65938 100644 --- a/application/forms/Config/ResourceConfigForm.php +++ b/application/forms/Config/ResourceConfigForm.php @@ -149,7 +149,7 @@ class ResourceConfigForm extends ConfigForm } } catch (InvalidArgumentException $e) { Notification::error($e->getMessage()); - return; + return false; } if ($this->save()) { From e025f59807626dea79a637a7e512a2a5973da9db Mon Sep 17 00:00:00 2001 From: Eric Lippmann Date: Wed, 27 May 2015 11:05:06 +0200 Subject: [PATCH 06/17] Don't provide helpful error messages for unauthenticated users fixes #6952 --- application/controllers/ErrorController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/controllers/ErrorController.php b/application/controllers/ErrorController.php index 0223a66b7..1c01b1672 100644 --- a/application/controllers/ErrorController.php +++ b/application/controllers/ErrorController.php @@ -37,7 +37,7 @@ class ErrorController extends ActionController $path = array_shift($path); $this->getResponse()->setHttpResponseCode(404); $this->view->message = $this->translate('Page not found.'); - if ($modules->hasInstalled($path) && ! $modules->hasEnabled($path)) { + if ($this->Auth()->isAuthenticated() && $modules->hasInstalled($path) && ! $modules->hasEnabled($path)) { $this->view->message .= ' ' . sprintf( $this->translate('Enabling the "%s" module might help!'), $path From e06225fcf16eaf28a5d98120113ed5efb7d2b53c Mon Sep 17 00:00:00 2001 From: Eric Lippmann Date: Wed, 27 May 2015 11:45:00 +0200 Subject: [PATCH 07/17] monitoring: Fix that searching for specific columns is no longer possible if default search columns are set --- library/Icinga/Web/Widget/FilterEditor.php | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/library/Icinga/Web/Widget/FilterEditor.php b/library/Icinga/Web/Widget/FilterEditor.php index 2d64e4c2b..dd84a5e52 100644 --- a/library/Icinga/Web/Widget/FilterEditor.php +++ b/library/Icinga/Web/Widget/FilterEditor.php @@ -216,25 +216,22 @@ class FilterEditor extends AbstractWidget $filter = $this->getFilter(); if ($search !== null) { - if (empty($this->searchColumns)) { - if (strpos($search, '=') === false) { - Notification::error(mt('monitoring', 'Cannot search here')); - return $this; - } else { - list($k, $v) = preg_split('/=/', $search); - $filter = $this->mergeRootExpression($filter, trim($k), '=', ltrim($v)); - } - } else { - if (false === $this->resetSearchColumns($filter)) { + if (strpos($search, '=') !== false) { + list($k, $v) = preg_split('/=/', $search); + $filter = $this->mergeRootExpression($filter, trim($k), '=', ltrim($v)); + } elseif (! empty($this->searchColumns)) { + if (! $this->resetSearchColumns($filter)) { $filter = Filter::matchAll(); } - $filters = array(); $search = ltrim($search); foreach ($this->searchColumns as $searchColumn) { $filters[] = Filter::expression($searchColumn, '=', "*$search*"); } $filter->andFilter(new FilterOr($filters)); + } else { + Notification::error(mt('monitoring', 'Cannot search here')); + return $this; } $url = $this->url()->setQueryString( From 2833f9edcc4896e501ae991bbf549c2cbe722d98 Mon Sep 17 00:00:00 2001 From: Eric Lippmann Date: Thu, 28 May 2015 09:44:01 +0200 Subject: [PATCH 08/17] Disable all form controls on submit to prevent resubmission fixes #7151 --- public/js/icinga/events.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/public/js/icinga/events.js b/public/js/icinga/events.js index cc927feb6..84354c960 100644 --- a/public/js/icinga/events.js +++ b/public/js/icinga/events.js @@ -274,6 +274,10 @@ } } + // Disable all form controls to prevent resubmission except for our search input + // Note that disabled form inputs will not be enabled via JavaScript again + $form.find(':input:not(#search):not(:disabled)').prop('disabled', true); + icinga.loader.loadUrl(url, $target, data, method); return false; From 344e17a6053ce036f7828b850c86cd89a90144fb Mon Sep 17 00:00:00 2001 From: Eric Lippmann Date: Thu, 28 May 2015 10:33:13 +0200 Subject: [PATCH 09/17] monitoring: Fix command links when showing multiple selected hosts fixes #9327 --- .../monitoring/application/controllers/HostsController.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/modules/monitoring/application/controllers/HostsController.php b/modules/monitoring/application/controllers/HostsController.php index 20ae71e6b..8f88330aa 100644 --- a/modules/monitoring/application/controllers/HostsController.php +++ b/modules/monitoring/application/controllers/HostsController.php @@ -131,13 +131,12 @@ class Monitoring_HostsController extends Controller $this->view->objects = $this->hostList; $this->view->unhandledObjects = $this->hostList->getUnhandledObjects(); $this->view->problemObjects = $this->hostList->getProblemObjects(); - $this->view->acknowledgeUnhandledLink = Url::fromPath('monitoring/hosts/acknowledge-problem') - ->setQueryString($this->hostList->getUnhandledObjects()->objectsFilter()); + ->setQueryString($this->hostList->getUnhandledObjects()->objectsFilter()->toQueryString()); $this->view->downtimeUnhandledLink = Url::fromPath('monitoring/hosts/schedule-downtime') - ->setQueryString($this->hostList->getUnhandledObjects()->objectsFilter()); + ->setQueryString($this->hostList->getUnhandledObjects()->objectsFilter()->toQueryString()); $this->view->downtimeLink = Url::fromPath('monitoring/hosts/schedule-downtime') - ->setQueryString($this->hostList->getProblemObjects()->objectsFilter()); + ->setQueryString($this->hostList->getProblemObjects()->objectsFilter()->toQueryString()); $this->view->acknowledgedObjects = $this->hostList->getAcknowledgedObjects(); $this->view->objectsInDowntime = $this->hostList->getObjectsInDowntime(); $this->view->inDowntimeLink = Url::fromPath('monitoring/list/hosts') From 646cffd62d615e6a4d716440a9f5728c19b87120 Mon Sep 17 00:00:00 2001 From: Eric Lippmann Date: Thu, 28 May 2015 12:22:57 +0200 Subject: [PATCH 10/17] monitoring: Remove the services tab when showing host or service details refs #7998 --- .../Web/Controller/MonitoredObjectController.php | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php b/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php index 9d27b1268..7ac509d7b 100644 --- a/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php +++ b/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php @@ -181,19 +181,6 @@ abstract class MonitoredObjectController extends Controller ) ); } - $tabs->add( - 'services', - array( - 'title' => sprintf( - $this->translate('List all services on host %s'), - $isService ? $object->getHost()->getName() : $object->getName() - ), - 'label' => $this->translate('Services'), - 'icon' => 'services', - 'url' => 'monitoring/show/services', - 'urlParams' => $params - ) - ); if ($this->backend->hasQuery('eventHistory')) { $tabs->add( 'history', From b3e0851b62d079c49d486b542c7845e662e88068 Mon Sep 17 00:00:00 2001 From: Eric Lippmann Date: Thu, 28 May 2015 12:24:00 +0200 Subject: [PATCH 11/17] monitoring: Remove the services tab when showing an object's history refs #7998 --- .../application/controllers/ShowController.php | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/modules/monitoring/application/controllers/ShowController.php b/modules/monitoring/application/controllers/ShowController.php index a8a4583d1..c26bb460f 100644 --- a/modules/monitoring/application/controllers/ShowController.php +++ b/modules/monitoring/application/controllers/ShowController.php @@ -228,19 +228,6 @@ class Monitoring_ShowController extends Controller ) ); } - $tabs->add( - 'services', - array( - 'title' => sprintf( - $this->translate('List all services on host %s'), - $isService ? $object->getHost()->getName() : $object->getName() - ), - 'label' => $this->translate('Services'), - 'icon' => 'services', - 'url' => 'monitoring/show/services', - 'urlParams' => $params, - ) - ); if ($this->backend->hasQuery('eventHistory')) { $tabs->add( 'history', From 8dbb215e27e199e8522ab597a355d5c6a247b9cf Mon Sep 17 00:00:00 2001 From: Eric Lippmann Date: Thu, 28 May 2015 12:25:31 +0200 Subject: [PATCH 12/17] monitoring: Remove services action from the ShowController refs #7998 --- .../application/controllers/ShowController.php | 14 -------------- .../application/views/scripts/show/services.phtml | 8 -------- 2 files changed, 22 deletions(-) delete mode 100644 modules/monitoring/application/views/scripts/show/services.phtml diff --git a/modules/monitoring/application/controllers/ShowController.php b/modules/monitoring/application/controllers/ShowController.php index c26bb460f..538a75132 100644 --- a/modules/monitoring/application/controllers/ShowController.php +++ b/modules/monitoring/application/controllers/ShowController.php @@ -78,20 +78,6 @@ class Monitoring_ShowController extends Controller $this->setupPaginationControl($this->view->history, 50); } - public function servicesAction() - { - $this->setAutorefreshInterval(15); - $this->getTabs()->activate('services'); - $this->_setParam('service', ''); - // TODO: This used to be a hack and still is. Modifying query string here. - $_SERVER['QUERY_STRING'] = (string) $this->params->without('service')->set('limit', ''); - $this->view->services = $this->view->action('services', 'list', 'monitoring', array( - 'view' => 'compact', - 'sort' => 'service_description', - )); - $this->fetchHostStats(); - } - protected function fetchHostStats() { $this->view->stats = $this->backend->select()->from('statusSummary', array( diff --git a/modules/monitoring/application/views/scripts/show/services.phtml b/modules/monitoring/application/views/scripts/show/services.phtml deleted file mode 100644 index d3a0c3ef8..000000000 --- a/modules/monitoring/application/views/scripts/show/services.phtml +++ /dev/null @@ -1,8 +0,0 @@ -
- compact): ?> - tabs; ?> - -render('partials/host/object-header.phtml') ?> -render('partials/host/servicesummary.phtml') ?> -
- From e0fe6440d242398da3f5ea984b949facb2e1059e Mon Sep 17 00:00:00 2001 From: Eric Lippmann Date: Thu, 28 May 2015 12:26:22 +0200 Subject: [PATCH 13/17] monitoring: Show host's services in the next container refs #7998 --- .../partials/host/servicesummary.phtml | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/modules/monitoring/application/views/scripts/partials/host/servicesummary.phtml b/modules/monitoring/application/views/scripts/partials/host/servicesummary.phtml index 04408808f..a851b7255 100644 --- a/modules/monitoring/application/views/scripts/partials/host/servicesummary.phtml +++ b/modules/monitoring/application/views/scripts/partials/host/servicesummary.phtml @@ -12,7 +12,7 @@ function urlAddFilterOptional($url, $filter, $optional) { return $url->setQueryString($f->toQueryString()); } -$selfUrl = Url::fromPath('monitoring/show/services', array('host' => $object->host_name)); +$selfUrl = Url::fromPath('monitoring/list/services', array('host' => $object->host_name)); $currentUrl = Url::fromRequest()->without('limit')->getRelativeUrl(); ?>
compact ? ' data-base-target="col1"' : ''; ?>> stats->services_total): ?> @@ -27,15 +27,18 @@ $currentUrl = Url::fromRequest()->without('limit')->getRelativeUrl(); ), $selfUrl, null, - array('title' => sprintf( - $this->translatePlural( - 'List all %u service on host %s', - 'List all %u services on host %s', - $object->stats->services_total + array( + 'title' => sprintf( + $this->translatePlural( + 'List all %u service on host %s', + 'List all %u services on host %s', + $object->stats->services_total + ), + $object->stats->services_total, + $object->host_name ), - $object->stats->services_total, - $object->host_name - )) + 'data-base-target' => '_next' + ) ); ?> translate('No services configured on this host'); ?> @@ -151,4 +154,4 @@ foreach (array(2 => 'critical', 3 => 'unknown', 1 => 'warning') as $stateId => $ -
\ No newline at end of file + From fa1a5c609d4148ff6c25d05939edfdcef2af7245 Mon Sep 17 00:00:00 2001 From: Eric Lippmann Date: Mon, 1 Jun 2015 17:21:11 +0200 Subject: [PATCH 14/17] monitoring: Open links of a host's service summary in the next container refs #7998 --- .../partials/host/servicesummary.phtml | 80 +++++++++++-------- 1 file changed, 46 insertions(+), 34 deletions(-) diff --git a/modules/monitoring/application/views/scripts/partials/host/servicesummary.phtml b/modules/monitoring/application/views/scripts/partials/host/servicesummary.phtml index a851b7255..dd111b27b 100644 --- a/modules/monitoring/application/views/scripts/partials/host/servicesummary.phtml +++ b/modules/monitoring/application/views/scripts/partials/host/servicesummary.phtml @@ -51,15 +51,18 @@ $currentUrl = Url::fromRequest()->without('limit')->getRelativeUrl(); $object->stats->services_ok, $selfUrl, array('service_state' => 0), - array('title' => sprintf( - $this->translatePlural( - 'List %u service that is currently in state OK on host %s', - 'List %u services which are currently in state OK on host %s', - $object->stats->services_ok + array( + 'title' => sprintf( + $this->translatePlural( + 'List %u service that is currently in state OK on host %s', + 'List %u services which are currently in state OK on host %s', + $object->stats->services_ok + ), + $object->stats->services_ok, + $object->host_name ), - $object->stats->services_ok, - $object->host_name - )) + 'data-base-target' => '_next' + ) ); ?> @@ -90,16 +93,19 @@ foreach (array(2 => 'critical', 3 => 'unknown', 1 => 'warning') as $stateId => $ $object->stats->$unhandled, $selfUrl, $paramsUnhandled, - array('title' => sprintf( - $this->translatePlural( - 'List %u service that is currently in state %s on host %s', - 'List %u services which are currently in state %s on host %s', - $object->stats->$unhandled + array( + 'title' => sprintf( + $this->translatePlural( + 'List %u service that is currently in state %s on host %s', + 'List %u services which are currently in state %s on host %s', + $object->stats->$unhandled + ), + $object->stats->$unhandled, + Service::getStateText($stateId, true), + $object->host_name ), - $object->stats->$unhandled, - Service::getStateText($stateId, true), - $object->host_name - )) + 'data-base-target' => '_next' + ) ); } if ($object->stats->$handled) { @@ -116,16 +122,19 @@ foreach (array(2 => 'critical', 3 => 'unknown', 1 => 'warning') as $stateId => $ $object->stats->$handled, $selfUrl, $paramsHandled, - array('title' => sprintf( - $this->translatePlural( - 'List %u service that is currently in state %s (Acknowledged) on host %s', - 'List %u services which are currently in state %s (Acknowledged) on host %s', - $object->stats->$handled + array( + 'title' => sprintf( + $this->translatePlural( + 'List %u service that is currently in state %s (Acknowledged) on host %s', + 'List %u services which are currently in state %s (Acknowledged) on host %s', + $object->stats->$handled + ), + $object->stats->$handled, + Service::getStateText($stateId, true), + $object->host_name ), - $object->stats->$handled, - Service::getStateText($stateId, true), - $object->host_name - )) + 'data-base-target' => '_next' + ) ); if ($object->stats->$unhandled) { echo "\n"; @@ -141,15 +150,18 @@ foreach (array(2 => 'critical', 3 => 'unknown', 1 => 'warning') as $stateId => $ $object->stats->services_pending, $selfUrl, array('service_state' => 99), - array('title' => sprintf( - $this->translatePlural( - 'List %u service that is currently in state PENDING on host %s', - 'List %u services which are currently in state PENDING on host %s', - $object->stats->services_pending + array( + 'title' => sprintf( + $this->translatePlural( + 'List %u service that is currently in state PENDING on host %s', + 'List %u services which are currently in state PENDING on host %s', + $object->stats->services_pending + ), + $object->stats->services_pending, + $object->host_name ), - $object->stats->services_pending, - $object->host_name - )) + 'data-base-target' => '_next' + ) ) ?> From 0ce2227385f5fc1531a5a8338adb730b986720b2 Mon Sep 17 00:00:00 2001 From: Eric Lippmann Date: Tue, 2 Jun 2015 10:06:54 +0200 Subject: [PATCH 15/17] monitoring: Don't add class active to followed links of a host's service summary The links now open in the next container. Managing active state of followed links is not yet possible. refs #7998 --- .../partials/host/servicesummary.phtml | 27 +++---------------- 1 file changed, 4 insertions(+), 23 deletions(-) diff --git a/modules/monitoring/application/views/scripts/partials/host/servicesummary.phtml b/modules/monitoring/application/views/scripts/partials/host/servicesummary.phtml index dd111b27b..b69682e1b 100644 --- a/modules/monitoring/application/views/scripts/partials/host/servicesummary.phtml +++ b/modules/monitoring/application/views/scripts/partials/host/servicesummary.phtml @@ -13,7 +13,6 @@ function urlAddFilterOptional($url, $filter, $optional) { } $selfUrl = Url::fromPath('monitoring/list/services', array('host' => $object->host_name)); -$currentUrl = Url::fromRequest()->without('limit')->getRelativeUrl(); ?>
compact ? ' data-base-target="col1"' : ''; ?>> stats->services_total): ?> qlink( @@ -46,7 +45,7 @@ $currentUrl = Url::fromRequest()->without('limit')->getRelativeUrl(); stats->services_ok): ?> - + qlink( $object->stats->services_ok, $selfUrl, @@ -74,19 +73,7 @@ foreach (array(2 => 'critical', 3 => 'unknown', 1 => 'warning') as $stateId => $ $unhandled = $pre . '_unhandled'; $paramsHandled = array('service_state' => $stateId, 'service_handled' => 1); $paramsUnhandled = array('service_state' => $stateId, 'service_handled' => 0); - if ($object->stats->$unhandled) { - $compareUrl = $selfUrl->with($paramsUnhandled)->getRelativeUrl(); - } else { - $compareUrl = $selfUrl->with($paramsHandled)->getRelativeUrl(); - } - - if ($compareUrl === $currentUrl) { - $active = ' active'; - } else { - $active = ''; - } - - echo ''; + echo ''; if ($object->stats->$unhandled) { echo $this->qlink( @@ -109,14 +96,8 @@ foreach (array(2 => 'critical', 3 => 'unknown', 1 => 'warning') as $stateId => $ ); } if ($object->stats->$handled) { - - if ($selfUrl->with($paramsHandled)->getRelativeUrl() === $currentUrl) { - $active = ' active'; - } else { - $active = ''; - } if ($object->stats->$unhandled) { - echo ''; + echo ''; } echo $this->qlink( $object->stats->$handled, @@ -145,7 +126,7 @@ foreach (array(2 => 'critical', 3 => 'unknown', 1 => 'warning') as $stateId => $ } ?> stats->services_pending): ?> - + qlink( $object->stats->services_pending, $selfUrl, From c01512d5e94558f3ce897de57fb16ea367c979dd Mon Sep 17 00:00:00 2001 From: Eric Lippmann Date: Tue, 2 Jun 2015 10:07:13 +0200 Subject: [PATCH 16/17] monitoring: Fix link to unhandled services of a host refs #7998 --- modules/monitoring/application/views/scripts/list/hosts.phtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/monitoring/application/views/scripts/list/hosts.phtml b/modules/monitoring/application/views/scripts/list/hosts.phtml index 5535d14fa..f8b77574d 100644 --- a/modules/monitoring/application/views/scripts/list/hosts.phtml +++ b/modules/monitoring/application/views/scripts/list/hosts.phtml @@ -69,7 +69,7 @@ if (count($hosts) === 0) { $this->translatePlural('%u unhandled service', '%u unhandled services', $host->host_unhandled_services), $host->host_unhandled_services ), - 'monitoring/show/services', + 'monitoring/list/services', array( 'host' => $host->host_name, 'service_problem' => 1, From 2da45d2e942f74d1b32389fe19474977ea2d9ae2 Mon Sep 17 00:00:00 2001 From: Eric Lippmann Date: Tue, 2 Jun 2015 10:07:43 +0200 Subject: [PATCH 17/17] monitoring: Fix link to a host's services in the service grid refs #7998 --- .../monitoring/application/views/scripts/list/servicegrid.phtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/monitoring/application/views/scripts/list/servicegrid.phtml b/modules/monitoring/application/views/scripts/list/servicegrid.phtml index a9cbac445..73fbfe3b5 100644 --- a/modules/monitoring/application/views/scripts/list/servicegrid.phtml +++ b/modules/monitoring/application/views/scripts/list/servicegrid.phtml @@ -67,7 +67,7 @@ foreach ($serviceDescriptions as $service_description): ?> qlink( $host_name, - 'monitoring/show/services?' . $serviceFilter, + 'monitoring/list/services?' . $serviceFilter, array('host' => $host_name), array('title' => sprintf($this->translate('List all reported services on host %s'), $host_name)) ); ?>