diff options
| author | Andrejs Verza <andrejs.verza@zabbix.com> | 2020-10-11 11:42:23 +0300 |
|---|---|---|
| committer | Andrejs Verza <andrejs.verza@zabbix.com> | 2020-10-11 11:42:23 +0300 |
| commit | 4de30d396a01fab8b3fe950438fe619e7464ff49 (patch) | |
| tree | 6b5c4ca65eb81f4ead5ad9e3a49ba7c6f0e6f8f3 /ui/app/controllers/CControllerHost.php | |
| parent | 9e7ea552f0dc6af69881656c1c4995d9320ed41b (diff) | |
..F....... [ZBXNEXT-6001] fixed incomplete merge commit
Diffstat (limited to 'ui/app/controllers/CControllerHost.php')
| -rw-r--r-- | ui/app/controllers/CControllerHost.php | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/ui/app/controllers/CControllerHost.php b/ui/app/controllers/CControllerHost.php index c9ad329f56e..ef7d495bc6a 100644 --- a/ui/app/controllers/CControllerHost.php +++ b/ui/app/controllers/CControllerHost.php @@ -72,7 +72,7 @@ abstract class CControllerHost extends CController { 'evaltype' => $filter['evaltype'], 'tags' => $filter['tags'], 'inheritedTags' => true, - 'groupids' => $groupids ? $groupids : null, + 'groupids' => $groupids, 'severities' => $filter['severities'] ? $filter['severities'] : null, 'withProblemsSuppressed' => $filter['severities'] ? (($filter['show_suppressed'] == ZBX_PROBLEM_SUPPRESSED_TRUE) ? null : false) @@ -106,7 +106,7 @@ abstract class CControllerHost extends CController { * @param string $filter['evaltype'] Filter hosts by tags. * @param string $filter['tags'] Filter hosts by tag names and values. * @param string $filter['severities'] Filter problems on hosts by severities. - * @param string $filter['show_suppressed'] Filter supressed problems. + * @param string $filter['show_suppressed'] Filter suppressed problems. * @param int $filter['maintenance_status'] Filter hosts by maintenance. * @param int $filter['page'] Page number. * @param string $filter['sort'] Sorting field. @@ -115,15 +115,14 @@ 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; + $groupids = $filter['groupids'] ? getSubGroups($filter['groupids']) : null; $hosts = API::Host()->get([ 'output' => ['hostid', 'name', 'status'], 'evaltype' => $filter['evaltype'], 'tags' => $filter['tags'], 'inheritedTags' => true, - 'groupids' => $groupids ? $groupids : null, + 'groupids' => $groupids, 'severities' => $filter['severities'] ? $filter['severities'] : null, 'withProblemsSuppressed' => $filter['severities'] ? (($filter['show_suppressed'] == ZBX_PROBLEM_SUPPRESSED_TRUE) ? null : false) @@ -153,7 +152,7 @@ abstract class CControllerHost extends CController { // Split result array and create paging. $paging = CPagerHelper::paginate($filter['page'], $hosts, $filter['sortorder'], $view_curl); - // Get additonal data to limited host amount. + // Get additional data to limited host amount. $hosts = API::Host()->get([ 'output' => ['hostid', 'name', 'status', 'maintenance_status', 'maintenanceid', 'maintenance_type', 'available', 'snmp_available', 'jmx_available', 'ipmi_available', 'error', 'ipmi_error', 'snmp_error', |