From c3d025f199d4af5acb6bc9abc1a926f9295aa1bd Mon Sep 17 00:00:00 2001 From: Wenrui LI Date: Fri, 25 Mar 2022 11:05:17 +0800 Subject: [PATCH 1/6] * fix unable to reorder in dynamic view, bug #21046. --- module/company/control.php | 4 ++-- module/company/js/dynamic.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/module/company/control.php b/module/company/control.php index bdd9fcc09f..6971c65e72 100644 --- a/module/company/control.php +++ b/module/company/control.php @@ -204,7 +204,8 @@ class company extends control $pager = new pager($recTotal, $recPerPage = 50, $pageID = 1); /* Append id for secend sort. */ - $orderBy = $direction == 'next' ? 'date_desc' : 'date_asc'; + if($direction == 'next') $orderBy = 'date_desc'; + if($direction == 'pre') $orderBy = 'date_asc'; $queryID = ($browseType == 'bysearch') ? (int)$param : 0; $date = empty($date) ? '' : date('Y-m-d', $date); @@ -288,7 +289,6 @@ class company extends control $this->view->pager = $pager; $this->view->userID = $userID; $this->view->param = $param; - $this->view->browseType = $browseType; $this->view->dateGroups = $this->action->buildDateGroup($actions, $direction, $browseType, $orderBy); $this->view->direction = $direction; $this->display(); diff --git a/module/company/js/dynamic.js b/module/company/js/dynamic.js index 1e6de4d1fa..ac0c4d1fb1 100644 --- a/module/company/js/dynamic.js +++ b/module/company/js/dynamic.js @@ -1,12 +1,12 @@ $('#account, #product, #project, #execution, #orderBy').change(function() { var userID = $('#account').val(); - var productID = $('#product').val(); + var productID = $('#product').length ? $('#product').val() : 0; var projectID = systemMode == 'new' ? $('#project').val() : 0; var executionID = $('#execution').val(); var orderBy = $('#orderBy').val(); browseType = browseType == 'bysearch' ? 'all' : browseType; - link = createLink('company', 'dynamic', 'browseType=' + browseType + '¶m=&recTotal=0&date=&direction=next&userID=' + userID + '&productID=' + productID + '&projectID=' + projectID + '&executionID=' + executionID + '&orderBy=' + orderBy); + link = createLink('company', 'dynamic', 'browseType=' + browseType + '¶m=&recTotal=0&date=&direction=no&userID=' + userID + '&productID=' + productID + '&projectID=' + projectID + '&executionID=' + executionID + '&orderBy=' + orderBy); location.href = link; }) From aed115d5cf40bbb92bc1777ee222bb78de90da40 Mon Sep 17 00:00:00 2001 From: Wenrui LI Date: Fri, 25 Mar 2022 11:11:10 +0800 Subject: [PATCH 2/6] * remove score notice for lite vision, bug #21119. --- module/common/view/footer.html.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/common/view/footer.html.php b/module/common/view/footer.html.php index a412c19a97..95e4a8db38 100755 --- a/module/common/view/footer.html.php +++ b/module/common/view/footer.html.php @@ -7,7 +7,7 @@ $.initSidebar(); viewType != 'xhtml'):?> -
loadModel('score')->getNotice(); ?>
+
vision != 'lite') echo $this->loadModel('score')->getNotice(); ?>