diff options
| -rw-r--r-- | ChangeLog.d/bugfix/ZBX-21677 | 1 | ||||
| -rw-r--r-- | ui/app/controllers/CControllerLatestView.php | 1 | ||||
| -rw-r--r-- | ui/app/partials/monitoring.latest.view.html.php | 2 | ||||
| -rw-r--r-- | ui/app/views/js/monitoring.latest.view.js.php | 2 | ||||
| -rw-r--r-- | ui/app/views/js/monitoring.problem.view.js.php | 2 | ||||
| -rw-r--r-- | ui/app/views/monitoring.latest.view.php | 4 |
6 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog.d/bugfix/ZBX-21677 b/ChangeLog.d/bugfix/ZBX-21677 new file mode 100644 index 00000000000..56d9cc310f2 --- /dev/null +++ b/ChangeLog.d/bugfix/ZBX-21677 @@ -0,0 +1 @@ +..F....... [ZBX-21677] fixed checkbox resetting in Monitoring->Latest data and Monitoring->Problems (rdetlavs) diff --git a/ui/app/controllers/CControllerLatestView.php b/ui/app/controllers/CControllerLatestView.php index d31f904b9a4..8c98c1b93df 100644 --- a/ui/app/controllers/CControllerLatestView.php +++ b/ui/app/controllers/CControllerLatestView.php @@ -200,6 +200,7 @@ class CControllerLatestView extends CControllerLatest { 'sort_order' => $sort_order, 'view_curl' => $view_url, 'paging' => $paging, + 'uncheck' => $this->hasInput('filter_reset'), 'config' => [ 'hk_trends' => CHousekeepingHelper::get(CHousekeepingHelper::HK_TRENDS), 'hk_trends_global' => CHousekeepingHelper::get(CHousekeepingHelper::HK_TRENDS_GLOBAL), diff --git a/ui/app/partials/monitoring.latest.view.html.php b/ui/app/partials/monitoring.latest.view.html.php index 67212a0d376..823ce4318a4 100644 --- a/ui/app/partials/monitoring.latest.view.html.php +++ b/ui/app/partials/monitoring.latest.view.html.php @@ -281,7 +281,7 @@ $form->addItem([ new CActionButtonList('graphtype', 'itemids', [ GRAPH_TYPE_STACKED => ['name' => _('Display stacked graph')], GRAPH_TYPE_NORMAL => ['name' => _('Display graph')] - ]) + ], 'latest') ]); echo $form; diff --git a/ui/app/views/js/monitoring.latest.view.js.php b/ui/app/views/js/monitoring.latest.view.js.php index 7e8b1f94f97..0fbcac3aa2a 100644 --- a/ui/app/views/js/monitoring.latest.view.js.php +++ b/ui/app/views/js/monitoring.latest.view.js.php @@ -68,11 +68,11 @@ this.filter.on(TABFILTER_EVENT_URLSET, () => { this.reloadPartialAndTabCounters(); + chkbxRange.clearSelectedOnFilterChange(); if (this.active_filter !== this.filter._active_item) { this.active_filter = this.filter._active_item; chkbxRange.checkObjectAll(chkbxRange.pageGoName, false); - chkbxRange.clearSelectedOnFilterChange(); } }); diff --git a/ui/app/views/js/monitoring.problem.view.js.php b/ui/app/views/js/monitoring.problem.view.js.php index cf9cc1f5ccb..9f476f20fdc 100644 --- a/ui/app/views/js/monitoring.problem.view.js.php +++ b/ui/app/views/js/monitoring.problem.view.js.php @@ -95,11 +95,11 @@ this.refreshResults(); this.refreshCounters(); + chkbxRange.clearSelectedOnFilterChange(); if (this.active_filter !== this.filter._active_item) { this.active_filter = this.filter._active_item; chkbxRange.checkObjectAll(chkbxRange.pageGoName, false); - chkbxRange.clearSelectedOnFilterChange(); } }); diff --git a/ui/app/views/monitoring.latest.view.php b/ui/app/views/monitoring.latest.view.php index be0d99ef775..3bcf4d0652a 100644 --- a/ui/app/views/monitoring.latest.view.php +++ b/ui/app/views/monitoring.latest.view.php @@ -35,6 +35,10 @@ $this->includeJsFile('monitoring.latest.view.js.php'); $this->enableLayoutModes(); $web_layout_mode = $this->getLayoutMode(); +if ($data['uncheck']) { + uncheckTableRows('latest'); +} + $widget = (new CWidget()) ->setTitle(_('Latest data')) ->setWebLayoutMode($web_layout_mode) |