diff options
| author | Miks Kronkalns <miks.kronkalns@zabbix.com> | 2020-12-11 20:14:58 +0300 |
|---|---|---|
| committer | Miks Kronkalns <miks.kronkalns@zabbix.com> | 2020-12-11 20:17:13 +0300 |
| commit | a458914ffa5da03ec68da96d2196ace3cb9035d2 (patch) | |
| tree | 8ba1e831372a2c23e5b409dd67251059ca4800f0 /ui/app/controllers/CControllerWidgetDataOverView.php | |
| parent | cdc8c9ec1169f845025e1ee0f5907c4972fc7a75 (diff) | |
..F....... [ZBX-18086] fixed missing data selection in data overview and trigger overview screens
* commit '7c41c9178d1cf1936f040b42e34e88b4bbba4461':
..F....... [ZBX-18086] fixed applying of limits for data overview
..F....... [ZBX-18086] simlified code
..F....... [ZBX-18086] improved performance
..F....... [ZBX-18086] simplified code; removed dead code
..F....... [ZBX-18086] fixed coding style
..F....... [ZBX-18086] fixed item grouping in data overview widget
..F....... [ZBX-18086] fixed selection of triggers to display in triggers overview
..F....... [ZBX-18086] fixed undefined offset error
..F....... [ZBX-18086] fixed unneeded references for function arguments
..F....... [ZBX-18086] fixed trigger grouping
..F....... [ZBX-18086] fixed item naming in data overview report header
..F....... [ZBX-18086] fixed nested API request
.D........ [ZBX-18086] fixed changelog
..F....... [ZBX-18086] fixed trigger overview data selection
..F....... [ZBX-18086] fixed undefined index error in data overview screen item
..F....... [ZBX-18086] fixed items to be grouped by name instead of key in data overview screen
..F....... [ZBX-18086] fixed warning mesage not be displayed in data overview report
..F....... [ZBX-18086] fixed hostid selection in getDataOverviewItems function
..F....... [ZBX-18086] fixed missing data selection in data overview screen
(cherry picked from commit 9e4febe1a3c1b63bdcc5ae9671dde0571f0a61a6)
Diffstat (limited to 'ui/app/controllers/CControllerWidgetDataOverView.php')
| -rw-r--r-- | ui/app/controllers/CControllerWidgetDataOverView.php | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/ui/app/controllers/CControllerWidgetDataOverView.php b/ui/app/controllers/CControllerWidgetDataOverView.php index 7407fa87175..33463e25e08 100644 --- a/ui/app/controllers/CControllerWidgetDataOverView.php +++ b/ui/app/controllers/CControllerWidgetDataOverView.php @@ -37,18 +37,7 @@ class CControllerWidgetDataOverView extends CControllerWidget { $groupids = $fields['groupids'] ? getSubGroups($fields['groupids']) : null; $hostids = $fields['hostids'] ? $fields['hostids'] : null; - if ($fields['style'] == STYLE_TOP) { - list($db_items, $db_hosts, $items_by_name, $has_hidden_data) = getDataOverviewTop($groupids, $hostids, - $fields['application'] - ); - } - else { - list($db_items, $db_hosts, $items_by_name, $has_hidden_data) = getDataOverviewLeft($groupids, $hostids, - $fields['application'] - ); - } - - $visible_items = getDataOverviewCellData($db_hosts, $db_items, $items_by_name, $fields['show_suppressed']); + [$items, $hosts, $has_hidden_data] = getDataOverview($groupids, $hostids, $fields); $this->setResponse(new CControllerResponseData([ 'name' => $this->getInput('name', $this->getDefaultHeader()), @@ -56,9 +45,8 @@ class CControllerWidgetDataOverView extends CControllerWidget { 'application' => $fields['application'], 'show_suppressed' => $fields['show_suppressed'], 'style' => $fields['style'], - 'visible_items' => $visible_items, - 'db_hosts' => $db_hosts, - 'items_by_name' => $items_by_name, + 'items' => $items, + 'hosts' => $hosts, 'has_hidden_data' => $has_hidden_data, 'user' => [ 'debug_mode' => $this->getDebugMode() |