From e42229d19a10223f27037d2253a78eb03840dac1 Mon Sep 17 00:00:00 2001 From: Gregory Chalenko Date: Wed, 7 Oct 2020 18:25:58 +0300 Subject: ..F....... [ZBXNEXT-710] minor coding style fix --- ui/app/controllers/CControllerHost.php | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'ui/app/controllers/CControllerHost.php') diff --git a/ui/app/controllers/CControllerHost.php b/ui/app/controllers/CControllerHost.php index 5d4d1e99510..f2e6fbc645b 100644 --- a/ui/app/controllers/CControllerHost.php +++ b/ui/app/controllers/CControllerHost.php @@ -65,14 +65,12 @@ abstract class CControllerHost extends CController { * @return int */ protected function getCount(array $filter): int { - $groupids = $filter['groupids'] ? getSubGroups($filter['groupids']) : null; - return (int) API::Host()->get([ 'countOutput' => true, 'evaltype' => $filter['evaltype'], 'tags' => $filter['tags'], 'inheritedTags' => true, - 'groupids' => $groupids ? $groupids : null, + 'groupids' => $filter['groupids'] ? getSubGroups($filter['groupids']) : null, 'severities' => $filter['severities'] ? $filter['severities'] : null, 'withProblemsSuppressed' => $filter['severities'] ? (($filter['show_suppressed'] == ZBX_PROBLEM_SUPPRESSED_TRUE) ? null : false) @@ -115,15 +113,13 @@ abstract class CControllerHost extends CController { * @return array */ protected function getData(array $filter): array { - $groupids = $filter['groupids'] ? getSubGroups($filter['groupids'], $filter_groups) : null; - $limit = CSettingsHelper::get(CSettingsHelper::SEARCH_LIMIT) + 1; $hosts = API::Host()->get([ 'output' => ['hostid', 'name', 'status'], 'evaltype' => $filter['evaltype'], 'tags' => $filter['tags'], 'inheritedTags' => true, - 'groupids' => $groupids ? $groupids : null, + 'groupids' => $filter['groupids'] ? getSubGroups($filter['groupids']) : null, 'severities' => $filter['severities'] ? $filter['severities'] : null, 'withProblemsSuppressed' => $filter['severities'] ? (($filter['show_suppressed'] == ZBX_PROBLEM_SUPPRESSED_TRUE) ? null : false) -- cgit v1.2.3