From a95e0e5f0a40f1a4609bc35a197857bf2ab8d0d5 Mon Sep 17 00:00:00 2001 From: wangyidong Date: Wed, 18 Oct 2023 13:09:23 +0800 Subject: [PATCH] * Fix dtable sort. --- module/product/css/browse.ui.css | 1 - module/productplan/ui/view.html.php | 2 ++ module/project/ui/browsebylist.html.php | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/module/product/css/browse.ui.css b/module/product/css/browse.ui.css index ab51daa5e2..e69de29bb2 100644 --- a/module/product/css/browse.ui.css +++ b/module/product/css/browse.ui.css @@ -1 +0,0 @@ -.dropdown-menu.popup{max-height:300px; overflow-y:auto;} diff --git a/module/productplan/ui/view.html.php b/module/productplan/ui/view.html.php index ec3fad84bc..f93677b0c2 100644 --- a/module/productplan/ui/view.html.php +++ b/module/productplan/ui/view.html.php @@ -203,6 +203,7 @@ detailBody set::onRenderCell(jsRaw('window.renderStoryCell')), set::footToolbar($storyFootToolbar), set::sortLink(createLink('productplan', 'view', "planID={$plan->id}&type=story&orderBy={name}_{sortType}&link=false¶m={$param}&recTotal={$storyPager->recTotal}&recPerPage={$storyPager->recPerPage}&page={$storyPager->pageID}")), + set::orderBy($orderBy), set::footer(array('checkbox', 'toolbar', array('html' => $summary, 'className' => "text-dark"), 'flex', 'pager')), set::footPager ( @@ -235,6 +236,7 @@ detailBody set::checkable($canBatchActionBug), set::footToolbar($bugFootToolbar), set::sortLink(createLink('productplan', 'view', "planID={$plan->id}&type=bug&orderBy={name}_{sortType}&link=false¶m={$param}&recTotal={$bugPager->recTotal}&recPerPage={$bugPager->recPerPage}&page={$bugPager->pageID}")), + set::orderBy($orderBy), set::footer(array('checkbox', 'toolbar', array('html' => sprintf($lang->productplan->bugSummary, count($planBugs)), 'className' => "text-dark"), 'flex', 'pager')), set::footPager ( diff --git a/module/project/ui/browsebylist.html.php b/module/project/ui/browsebylist.html.php index b0499bbe3b..a622f226c5 100644 --- a/module/project/ui/browsebylist.html.php +++ b/module/project/ui/browsebylist.html.php @@ -101,6 +101,7 @@ dtable set::checkable($canBatchEdit), set::footToolbar($footToolbar), set::sortLink(helper::createLink('project', 'browse', "programID=$programID&browseType=$browseType¶m=$param&orderBy={name}_{sortType}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}")), + set::orderBy($orderBy), set::footPager(usePager()), set::customCols(true) );