diff options
| author | Gregory Chalenko <gregory.chalenko@zabbix.com> | 2020-09-02 10:01:38 +0300 |
|---|---|---|
| committer | Gregory Chalenko <gregory.chalenko@zabbix.com> | 2020-09-02 10:01:38 +0300 |
| commit | 53a0ffcfc2b67e537b74099df6658ffbf7ee2431 (patch) | |
| tree | e29cc86af9d4522e602ddc7d95b1a829f1d42dc2 /ui/app/controllers/CControllerHost.php | |
| parent | 96f31ea72435bf63e658809c7b31f04f8b307f12 (diff) | |
| parent | 30445ccdbefb31a763b81ee35b164be9cb5044ff (diff) | |
.......... [ZBXNEXT-710] merged from latest master; fixed conflicts in:
- create/src/schema.tmpl
- src/libs/zbxdbupgrade/dbupgrade_5010.c
- ui/app/controllers/CControllerHost.php
- ui/app/views/monitoring.host.view.php
- ui/include/defines.inc.php
Diffstat (limited to 'ui/app/controllers/CControllerHost.php')
| -rw-r--r-- | ui/app/controllers/CControllerHost.php | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/ui/app/controllers/CControllerHost.php b/ui/app/controllers/CControllerHost.php index e6bf596ac97..88d847b2735 100644 --- a/ui/app/controllers/CControllerHost.php +++ b/ui/app/controllers/CControllerHost.php @@ -184,9 +184,7 @@ abstract class CControllerHost extends CController { $groupids = array_keys($filter_groups); } - - $config = select_config(); - + $limit = CSettingsHelper::get(CSettingsHelper::SEARCH_LIMIT) + 1; $hosts = API::Host()->get([ 'output' => ['hostid', 'name', 'status'], 'evaltype' => $filter['evaltype'], @@ -210,7 +208,7 @@ abstract class CControllerHost extends CController { : HOST_MAINTENANCE_STATUS_OFF, ], 'sortfield' => 'name', - 'limit' => $config['search_limit'] + 1, + 'limit' => $limit, 'preservekeys' => true ]); |