From 646a521c98e25e60f30cd97948a589a066331222 Mon Sep 17 00:00:00 2001 From: wangyidong Date: Mon, 10 Jul 2023 10:41:02 +0800 Subject: [PATCH] * Code for task #97032. --- module/execution/ui/all.html.php | 12 +++---- module/index/config.php | 1 + module/product/config/dtable.php | 59 +++++++++++++++++--------------- 3 files changed, 38 insertions(+), 34 deletions(-) diff --git a/module/execution/ui/all.html.php b/module/execution/ui/all.html.php index 8df643a7aa..51bb676551 100644 --- a/module/execution/ui/all.html.php +++ b/module/execution/ui/all.html.php @@ -90,12 +90,12 @@ dtable set::customCols(true), set::footToolbar($footToolbar), set::onRenderCell(jsRaw('window.onRenderCell')), - set::footPager( - usePager(), - set::recPerPage($recPerPage), - set::recTotal($recTotal), - set::linkCreator(helper::createLink('execution', 'all', "status={$status}&orderBy={$orderBy}&productID={$productID}¶m=$param&recTotal={$recTotal}&recPerPage={recPerPage}&page={page}")) - ), + set::footPager(usePager(array + ( + 'recPerPage' => $recPerPage, + 'recTotal' => $recTotal, + 'linkCreator' => helper::createLink('execution', 'all', "status={$status}&orderBy={$orderBy}&productID={$productID}¶m=$param&recTotal={$recTotal}&recPerPage={recPerPage}&page={page}") + ))), ); render(); diff --git a/module/index/config.php b/module/index/config.php index 90d1bf0f3b..d2ef9a78e4 100644 --- a/module/index/config.php +++ b/module/index/config.php @@ -68,3 +68,4 @@ $config->index->oldPages[] = 'action-trash'; $config->index->oldPages[] = 'dept-browse'; $config->index->oldPages[] = 'story-report'; $config->index->oldPages[] = 'tree-browse'; +$config->index->oldPages[] = 'user-dynamic'; diff --git a/module/product/config/dtable.php b/module/product/config/dtable.php index f9e6671c6a..e320cfa402 100644 --- a/module/product/config/dtable.php +++ b/module/product/config/dtable.php @@ -151,6 +151,7 @@ $config->product->all->dtable->fieldList['name']['show'] = true; $config->product->all->dtable->fieldList['name']['nestedToggle'] = false; $config->product->all->dtable->fieldList['name']['checkbox'] = true; $config->product->all->dtable->fieldList['name']['link'] = helper::createLink('product', 'browse', "productID={id}"); +$config->product->all->dtable->fieldList['name']['sortType'] = true; $config->product->all->dtable->fieldList['name']['group'] = 'g1'; $config->product->all->dtable->fieldList['productLine']['name'] = 'productLine'; @@ -160,18 +161,20 @@ $config->product->all->dtable->fieldList['productLine']['type'] = 'format'; $config->product->all->dtable->fieldList['productLine']['show'] = true; $config->product->all->dtable->fieldList['productLine']['group'] = 'g2'; -$config->product->all->dtable->fieldList['PO']['name'] = 'PO'; -$config->product->all->dtable->fieldList['PO']['title'] = $lang->product->manager; -$config->product->all->dtable->fieldList['PO']['width'] = 108; -$config->product->all->dtable->fieldList['PO']['type'] = 'avatarBtn'; -$config->product->all->dtable->fieldList['PO']['show'] = true; -$config->product->all->dtable->fieldList['PO']['group'] = 'g3'; +$config->product->all->dtable->fieldList['PO']['name'] = 'PO'; +$config->product->all->dtable->fieldList['PO']['title'] = $lang->product->manager; +$config->product->all->dtable->fieldList['PO']['width'] = 108; +$config->product->all->dtable->fieldList['PO']['type'] = 'avatarBtn'; +$config->product->all->dtable->fieldList['PO']['show'] = true; +$config->product->all->dtable->fieldList['PO']['sortType'] = true; +$config->product->all->dtable->fieldList['PO']['group'] = 'g3'; -$config->product->all->dtable->fieldList['createdBy']['name'] = 'createdBy'; -$config->product->all->dtable->fieldList['createdBy']['title'] = $lang->openedByAB; -$config->product->all->dtable->fieldList['createdBy']['width'] = 80; -$config->product->all->dtable->fieldList['createdBy']['type'] = 'user'; -$config->product->all->dtable->fieldList['createdBy']['group'] = '1'; +$config->product->all->dtable->fieldList['createdBy']['name'] = 'createdBy'; +$config->product->all->dtable->fieldList['createdBy']['title'] = $lang->openedByAB; +$config->product->all->dtable->fieldList['createdBy']['width'] = 80; +$config->product->all->dtable->fieldList['createdBy']['type'] = 'user'; +$config->product->all->dtable->fieldList['createdBy']['sortType'] = true; +$config->product->all->dtable->fieldList['createdBy']['group'] = '1'; $config->product->all->dtable->fieldList['createdDate']['name'] = 'createdDate'; $config->product->all->dtable->fieldList['createdDate']['title'] = $lang->product->createdDate; @@ -185,7 +188,7 @@ $config->product->all->dtable->fieldList['draftStories']['title'] = $lang->pr $config->product->all->dtable->fieldList['draftStories']['width'] = 64; $config->product->all->dtable->fieldList['draftStories']['type'] = 'number'; $config->product->all->dtable->fieldList['draftStories']['show'] = true; -$config->product->all->dtable->fieldList['draftStories']['sortType'] = true; +$config->product->all->dtable->fieldList['draftStories']['sortType'] = false; $config->product->all->dtable->fieldList['draftStories']['group'] = 'g4'; $config->product->all->dtable->fieldList['activeStories']['name'] = 'activeStories'; @@ -193,7 +196,7 @@ $config->product->all->dtable->fieldList['activeStories']['title'] = $lang->p $config->product->all->dtable->fieldList['activeStories']['width'] = 64; $config->product->all->dtable->fieldList['activeStories']['type'] = 'number'; $config->product->all->dtable->fieldList['activeStories']['show'] = true; -$config->product->all->dtable->fieldList['activeStories']['sortType'] = true; +$config->product->all->dtable->fieldList['activeStories']['sortType'] = false; $config->product->all->dtable->fieldList['activeStories']['group'] = 'g4'; $config->product->all->dtable->fieldList['changingStories']['name'] = 'changingStories'; @@ -201,7 +204,7 @@ $config->product->all->dtable->fieldList['changingStories']['title'] = $lang- $config->product->all->dtable->fieldList['changingStories']['width'] = 64; $config->product->all->dtable->fieldList['changingStories']['type'] = 'number'; $config->product->all->dtable->fieldList['changingStories']['show'] = true; -$config->product->all->dtable->fieldList['changingStories']['sortType'] = true; +$config->product->all->dtable->fieldList['changingStories']['sortType'] = false; $config->product->all->dtable->fieldList['changingStories']['group'] = 'g4'; $config->product->all->dtable->fieldList['reviewingStories']['name'] = 'reviewingStories'; @@ -209,7 +212,7 @@ $config->product->all->dtable->fieldList['reviewingStories']['title'] = $lang $config->product->all->dtable->fieldList['reviewingStories']['width'] = 64; $config->product->all->dtable->fieldList['reviewingStories']['type'] = 'number'; $config->product->all->dtable->fieldList['reviewingStories']['show'] = true; -$config->product->all->dtable->fieldList['reviewingStories']['sortType'] = true; +$config->product->all->dtable->fieldList['reviewingStories']['sortType'] = false; $config->product->all->dtable->fieldList['reviewingStories']['group'] = 'g4'; $config->product->all->dtable->fieldList['totalStories']['name'] = 'totalStories'; @@ -217,7 +220,7 @@ $config->product->all->dtable->fieldList['totalStories']['title'] = $lang->pr $config->product->all->dtable->fieldList['totalStories']['width'] = 92; $config->product->all->dtable->fieldList['totalStories']['minWidth'] = 100; $config->product->all->dtable->fieldList['totalStories']['type'] = 'number'; -$config->product->all->dtable->fieldList['totalStories']['sortType'] = true; +$config->product->all->dtable->fieldList['totalStories']['sortType'] = false; $config->product->all->dtable->fieldList['totalStories']['group'] = 'g4'; $config->product->all->dtable->fieldList['storyCompleteRate']['name'] = 'storyCompleteRate'; @@ -225,7 +228,7 @@ $config->product->all->dtable->fieldList['storyCompleteRate']['title'] = $lan $config->product->all->dtable->fieldList['storyCompleteRate']['width'] = 64; $config->product->all->dtable->fieldList['storyCompleteRate']['type'] = 'progress'; $config->product->all->dtable->fieldList['storyCompleteRate']['show'] = true; -$config->product->all->dtable->fieldList['storyCompleteRate']['sortType'] = true; +$config->product->all->dtable->fieldList['storyCompleteRate']['sortType'] = false; $config->product->all->dtable->fieldList['storyCompleteRate']['group'] = 'g4'; $config->product->all->dtable->fieldList['plans']['name'] = 'plans'; @@ -233,7 +236,7 @@ $config->product->all->dtable->fieldList['plans']['title'] = $lang->product-> $config->product->all->dtable->fieldList['plans']['width'] = 64; $config->product->all->dtable->fieldList['plans']['type'] = 'number'; $config->product->all->dtable->fieldList['plans']['show'] = true; -$config->product->all->dtable->fieldList['plans']['sortType'] = true; +$config->product->all->dtable->fieldList['plans']['sortType'] = false; $config->product->all->dtable->fieldList['plans']['group'] = 'g5'; $config->product->all->dtable->fieldList['execution']['name'] = 'execution'; @@ -241,16 +244,16 @@ $config->product->all->dtable->fieldList['execution']['title'] = $lang->execu $config->product->all->dtable->fieldList['execution']['width'] = 64; $config->product->all->dtable->fieldList['execution']['type'] = 'number'; $config->product->all->dtable->fieldList['execution']['show'] = true; -$config->product->all->dtable->fieldList['execution']['sortType'] = true; +$config->product->all->dtable->fieldList['execution']['sortType'] = false; $config->product->all->dtable->fieldList['execution']['group'] = 'g6'; $config->product->all->dtable->fieldList['testCaseCoverage']['name'] = 'testCaseCoverage'; $config->product->all->dtable->fieldList['testCaseCoverage']['title'] = $lang->product->testCaseCoverage; -$config->product->all->dtable->fieldList['testCaseCoverage']['width'] = 12; +$config->product->all->dtable->fieldList['testCaseCoverage']['width'] = 80; $config->product->all->dtable->fieldList['testCaseCoverage']['type'] = 'progress'; -$config->product->all->dtable->fieldList['testCaseCoverage']['minWidth'] = 108; +$config->product->all->dtable->fieldList['testCaseCoverage']['minWidth'] = 80; $config->product->all->dtable->fieldList['testCaseCoverage']['show'] = true; -$config->product->all->dtable->fieldList['testCaseCoverage']['sortType'] = true; +$config->product->all->dtable->fieldList['testCaseCoverage']['sortType'] = false; $config->product->all->dtable->fieldList['testCaseCoverage']['group'] = 'g7'; $config->product->all->dtable->fieldList['totalActivatedBugs']['name'] = 'totalActivatedBugs'; @@ -259,7 +262,7 @@ $config->product->all->dtable->fieldList['totalActivatedBugs']['width'] = 64; $config->product->all->dtable->fieldList['totalActivatedBugs']['minWidth'] = 86; $config->product->all->dtable->fieldList['totalActivatedBugs']['type'] = 'number'; $config->product->all->dtable->fieldList['totalActivatedBugs']['show'] = true; -$config->product->all->dtable->fieldList['totalActivatedBugs']['sortType'] = true; +$config->product->all->dtable->fieldList['totalActivatedBugs']['sortType'] = false; $config->product->all->dtable->fieldList['totalActivatedBugs']['group'] = 'g8'; $config->product->all->dtable->fieldList['totalBugs']['name'] = 'totalBugs'; @@ -267,7 +270,7 @@ $config->product->all->dtable->fieldList['totalBugs']['title'] = $lang->produ $config->product->all->dtable->fieldList['totalBugs']['width'] = 64; $config->product->all->dtable->fieldList['totalBugs']['minWidth'] = 86; $config->product->all->dtable->fieldList['totalBugs']['type'] = 'number'; -$config->product->all->dtable->fieldList['totalBugs']['sortType'] = true; +$config->product->all->dtable->fieldList['totalBugs']['sortType'] = false; $config->product->all->dtable->fieldList['totalBugs']['group'] = 'g8'; $config->product->all->dtable->fieldList['bugFixedRate']['name'] = 'bugFixedRate'; @@ -275,15 +278,15 @@ $config->product->all->dtable->fieldList['bugFixedRate']['title'] = $lang->pr $config->product->all->dtable->fieldList['bugFixedRate']['width'] = 64; $config->product->all->dtable->fieldList['bugFixedRate']['type'] = 'progress'; $config->product->all->dtable->fieldList['bugFixedRate']['show'] = true; -$config->product->all->dtable->fieldList['bugFixedRate']['sortType'] = true; +$config->product->all->dtable->fieldList['bugFixedRate']['sortType'] = false; $config->product->all->dtable->fieldList['bugFixedRate']['group'] = 'g8'; $config->product->all->dtable->fieldList['releases']['name'] = 'releases'; $config->product->all->dtable->fieldList['releases']['title'] = $lang->product->release; -$config->product->all->dtable->fieldList['releases']['width'] = 12; +$config->product->all->dtable->fieldList['releases']['width'] = 80; $config->product->all->dtable->fieldList['releases']['type'] = 'number'; $config->product->all->dtable->fieldList['releases']['show'] = true; -$config->product->all->dtable->fieldList['releases']['sortType'] = true; +$config->product->all->dtable->fieldList['releases']['sortType'] = false; $config->product->all->dtable->fieldList['releases']['group'] = 'g9'; $config->product->all->dtable->fieldList['latestReleaseDate']['name'] = 'latestReleaseDate'; @@ -291,7 +294,7 @@ $config->product->all->dtable->fieldList['latestReleaseDate']['title'] = $lan $config->product->all->dtable->fieldList['latestReleaseDate']['width'] = 96; $config->product->all->dtable->fieldList['latestReleaseDate']['minWidth'] = 120; $config->product->all->dtable->fieldList['latestReleaseDate']['type'] = 'date'; -$config->product->all->dtable->fieldList['latestReleaseDate']['sortType'] = true; +$config->product->all->dtable->fieldList['latestReleaseDate']['sortType'] = false; $config->product->all->dtable->fieldList['latestReleaseDate']['group'] = 'g9'; $config->product->all->dtable->fieldList['latestRelease']['name'] = 'latestRelease';