From 0bde465295e765e295b29304b737ee2f833a5e13 Mon Sep 17 00:00:00 2001 From: "Alexander A. Klimov" Date: Mon, 18 May 2015 16:29:33 +0200 Subject: [PATCH] Rename ::extraColumns() to ::addColumns() refs #4498 --- .../monitoring/application/controllers/ListController.php | 8 ++++---- .../monitoring/application/views/scripts/list/hosts.phtml | 2 +- .../application/views/scripts/list/services.phtml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php index 27f02f3f9..5be9fcd09 100644 --- a/modules/monitoring/application/controllers/ListController.php +++ b/modules/monitoring/application/controllers/ListController.php @@ -94,7 +94,7 @@ class Monitoring_ListController extends Controller 'host_passive_checks_enabled', 'host_current_check_attempt', 'host_max_check_attempts' - ), $this->extraColumns())); + ), $this->addColumns())); $this->filterQuery($query); $this->applyRestriction('monitoring/hosts/filter', $query); $this->view->hosts = $query; @@ -177,7 +177,7 @@ class Monitoring_ListController extends Controller 'service_passive_checks_enabled', 'current_check_attempt' => 'service_current_check_attempt', 'max_check_attempts' => 'service_max_check_attempts' - ), $this->extraColumns()); + ), $this->addColumns()); $query = $this->backend->select()->from('serviceStatus', $columns); $this->filterQuery($query); $this->applyRestriction('monitoring/services/filter', $query); @@ -644,7 +644,7 @@ class Monitoring_ListController extends Controller return $query; } - protected function extraColumns() + protected function addColumns() { $columns = preg_split( '~,~', @@ -652,7 +652,7 @@ class Monitoring_ListController extends Controller -1, PREG_SPLIT_NO_EMPTY ); - $this->view->extraColumns = $columns; + $this->view->addColumns = $columns; return $columns; } diff --git a/modules/monitoring/application/views/scripts/list/hosts.phtml b/modules/monitoring/application/views/scripts/list/hosts.phtml index 196279b04..89c2e7d26 100644 --- a/modules/monitoring/application/views/scripts/list/hosts.phtml +++ b/modules/monitoring/application/views/scripts/list/hosts.phtml @@ -92,7 +92,7 @@ if (count($hosts) === 0) {

escape($this->ellipsis($host->host_output, 10000)) ?>

- extraColumns as $col): ?> + addColumns as $col): ?> escape($host->$col) ?> diff --git a/modules/monitoring/application/views/scripts/list/services.phtml b/modules/monitoring/application/views/scripts/list/services.phtml index 63d9076c3..12ba232cc 100644 --- a/modules/monitoring/application/views/scripts/list/services.phtml +++ b/modules/monitoring/application/views/scripts/list/services.phtml @@ -81,7 +81,7 @@ if (count($services) === 0) { ); ?>

escape($this->ellipsis($service->service_output, 10000)); ?>

-extraColumns as $col): ?> +addColumns as $col): ?> escape($service->$col) ?>