Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/zabbix/zabbix.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Shubin <aleksandrs.subins@zabbix.com>2020-10-16 18:14:37 +0300
committerAlexander Shubin <aleksandrs.subins@zabbix.com>2020-10-16 18:14:37 +0300
commit862c23f1adc912bb4b883babff3ec2f1acebed99 (patch)
tree7e248434659f7dbef1aa99236879ac04cdac8dcc /ui/app/controllers/CControllerHost.php
parent4929139594d1e4cdb49d9a0ba9592bad586ec1cc (diff)
parent83b963c222db5aecce625d040b888659f1c2dd22 (diff)
.......... [ZBXNEXT-710] updated to latest from master; no conflicts
Diffstat (limited to 'ui/app/controllers/CControllerHost.php')
-rw-r--r--ui/app/controllers/CControllerHost.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/ui/app/controllers/CControllerHost.php b/ui/app/controllers/CControllerHost.php
index 398163d2e0d..8bcedcd39b5 100644
--- a/ui/app/controllers/CControllerHost.php
+++ b/ui/app/controllers/CControllerHost.php
@@ -160,7 +160,6 @@ abstract class CControllerHost extends CController {
],
'selectInterfaces' => ['ip', 'dns', 'port', 'main', 'type', 'useip'],
'selectGraphs' => API_OUTPUT_COUNT,
- 'selectScreens' => API_OUTPUT_COUNT,
'selectHttpTests' => API_OUTPUT_COUNT,
'selectTags' => ['tag', 'value'],
'selectInheritedTags' => ['tag', 'value'],
@@ -199,6 +198,9 @@ abstract class CControllerHost extends CController {
}
foreach ($hosts as &$host) {
+ // Count number of dashboards for each host.
+ $host['dashboards'] = count(getHostDashboards($host['hostid']));
+
CArrayHelper::sort($host['interfaces'], [['field' => 'main', 'order' => ZBX_SORT_DOWN]]);
if ($host['status'] == HOST_STATUS_MONITORED && $host['maintenance_status'] == HOST_MAINTENANCE_STATUS_ON) {