From 11f99c1955179c3ef78bcaa33e0892e7fd73c60c Mon Sep 17 00:00:00 2001 From: wangyidong Date: Wed, 21 Jan 2026 16:42:59 +0800 Subject: [PATCH] * [refac bug #69066] Add dateLabel for options. --- module/metric/control.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/module/metric/control.php b/module/metric/control.php index 61684130d8..92994dd38c 100755 --- a/module/metric/control.php +++ b/module/metric/control.php @@ -354,13 +354,14 @@ class metric extends control $this->display(); } - public function ajaxGetTableAndCharts($metricID, $scope = '', $dateLabel = '', $dateBegin = '', $dateEnd = '', $viewType = 'single', $recTotal = 0, $recPerPage = 100, $pageID = 1) + public function ajaxGetTableAndCharts($metricID, $scope = '', $calcDate = '', $dateBegin = '', $dateEnd = '', $viewType = 'single', $recTotal = 0, $recPerPage = 100, $pageID = 1) { $usePager = empty($scope); $dateBegin = str_replace('_', '-', $dateBegin); $dateEnd = str_replace('_', '-', $dateEnd); - $options = array_filter(array('scope' => $scope, 'calcDate' => $dateLabel, 'dateBegin' => $dateBegin, 'dateEnd' => $dateEnd)); + $dateLabel = isset($_POST['dateLabel']) ? $_POST['dateLabel'] : ''; + $options = array_filter(array('scope' => $scope, 'calcDate' => $calcDate, 'dateLabel' => $dateLabel, 'dateBegin' => $dateBegin, 'dateEnd' => $dateEnd)); $this->app->loadClass('pager', true); $pager = new pager($recTotal, $recPerPage, $pageID);