From a78e7b74d7e9429ca6523d14eefa1daa30eb6be6 Mon Sep 17 00:00:00 2001 From: wangyidong Date: Tue, 24 Oct 2023 14:34:35 +0800 Subject: [PATCH] * Adjust for show search box. --- extension/lite/execution/ext/model/lite.php | 6 +++--- module/my/control.php | 1 - module/my/model.php | 8 ++++---- module/my/ui/bug.html.php | 2 +- module/my/ui/doc.html.php | 2 +- module/my/ui/requirement.html.php | 2 +- module/my/ui/story.html.php | 2 +- module/my/ui/task.html.php | 2 +- module/my/ui/testcase.html.php | 2 +- module/my/ui/todo.html.php | 2 +- 10 files changed, 14 insertions(+), 15 deletions(-) diff --git a/extension/lite/execution/ext/model/lite.php b/extension/lite/execution/ext/model/lite.php index c74aeb05a9..33eccd0e6b 100644 --- a/extension/lite/execution/ext/model/lite.php +++ b/extension/lite/execution/ext/model/lite.php @@ -1,5 +1,5 @@ lang->modulePageNav = $modulePageNav; } -public function getTree($executionID) +public function getTree(int $executionID): array { $fullTrees = $this->loadModel('tree')->getTaskStructure($executionID, 0); @@ -121,7 +121,7 @@ public function getTree($executionID) return array_values($newTrees); } -public function getTRActions($currentMethod) +public function getTRActions(string $currentMethod): string { $subMenu = $this->lang->execution->menu; diff --git a/module/my/control.php b/module/my/control.php index 08047a28f0..357be8ece8 100755 --- a/module/my/control.php +++ b/module/my/control.php @@ -558,7 +558,6 @@ EOF; if($type != 'bySearch') $this->session->set('myBugType', $type); if($this->app->viewType != 'json') $this->session->set('bugList', $this->app->getURI(true), 'qa'); - /* Load pager. */ $this->app->loadClass('pager', $static = true); if($this->app->getViewType() == 'mhtml') $recPerPage = 10; diff --git a/module/my/model.php b/module/my/model.php index 796d215f47..1159c819dc 100644 --- a/module/my/model.php +++ b/module/my/model.php @@ -418,7 +418,7 @@ class myModel extends model $scene = $this->loadModel('testcase')->getSceneMenu(0); - $queryName = $type == 'contribute' ? 'contributeTestcase' : 'workTestcase'; + $queryName = $this->app->rawMethod . 'Testcase'; $this->app->loadModuleConfig('testcase'); $this->config->testcase->search['module'] = $queryName; $this->config->testcase->search['queryID'] = $queryID; @@ -684,7 +684,7 @@ class myModel extends model ->beginIF(!$this->app->user->admin)->andWhere('id')->in($this->app->user->view->projects)->fi() ->orderBy('order_asc') ->fetchPairs(); - $queryName = $type == 'contribute' ? 'contributeRisk' : 'workRisk'; + $queryName = $this->app->rawMethod . 'Risk'; $this->app->loadConfig('risk'); $this->config->risk->search['module'] = $queryName; @@ -778,7 +778,7 @@ class myModel extends model $productIdList = array_keys($products); $branchParam = ''; - $queryName = $type == 'contribute' ? 'contributeStory' : 'workStory'; + $queryName = $this->app->rawMethod . 'Story'; $this->app->loadConfig('product'); $this->config->product->search['module'] = $queryName; $this->config->product->search['queryID'] = $queryID; @@ -892,7 +892,7 @@ class myModel extends model $productIdList = array_keys($products); $branchParam = ''; - $queryName = $type == 'contribute' ? 'contributeRequirement' : 'workRequirement'; + $queryName = $this->app->rawMethod . 'Requirement'; $this->app->loadConfig('product'); $this->config->product->search['module'] = $queryName; $this->config->product->search['queryID'] = $queryID; diff --git a/module/my/ui/bug.html.php b/module/my/ui/bug.html.php index 2168d6f8cb..4ab30039b9 100644 --- a/module/my/ui/bug.html.php +++ b/module/my/ui/bug.html.php @@ -22,7 +22,7 @@ featurebar ( set::current($type), set::linkParams($linkParam), - li(searchToggle(set::module('bug'))) + li(searchToggle(set::module($this->app->rawMethod . 'Bug'))) ); $canBatchEdit = common::hasPriv('bug', 'batchEdit') && $type == 'assignedTo'; diff --git a/module/my/ui/doc.html.php b/module/my/ui/doc.html.php index 332eab5f9f..76970b1e55 100644 --- a/module/my/ui/doc.html.php +++ b/module/my/ui/doc.html.php @@ -18,7 +18,7 @@ featureBar ( set::current($type), set::linkParams("mode=doc&type={key}¶m={$param}"), - li(searchToggle(set::module('doc'))) + li(searchToggle(set::module('contributeDoc'))) ); if($type == 'openedbyme') unset($config->my->doc->dtable->fieldList['addedBy']); diff --git a/module/my/ui/requirement.html.php b/module/my/ui/requirement.html.php index 27816ea380..5d6224186c 100644 --- a/module/my/ui/requirement.html.php +++ b/module/my/ui/requirement.html.php @@ -14,7 +14,7 @@ featureBar ( set::current($type), set::linkParams("mode=requirement&type={key}¶m={$param}"), - li(searchToggle(set::module('story'))) + li(searchToggle(set::module($this->app->rawMethod . 'Requirement'))) ); $canBatchEdit = common::hasPriv('story', 'batchEdit'); diff --git a/module/my/ui/story.html.php b/module/my/ui/story.html.php index e48ad002b6..f22585ae32 100644 --- a/module/my/ui/story.html.php +++ b/module/my/ui/story.html.php @@ -16,7 +16,7 @@ featureBar ( set::current($type), set::linkParams("mode=story&type={key}¶m={$param}"), - li(searchToggle(set::module('story'))) + li(searchToggle(set::module($this->app->rawMethod . 'Story'))) ); $canBatchEdit = common::hasPriv('story', 'batchEdit'); diff --git a/module/my/ui/task.html.php b/module/my/ui/task.html.php index 225acbc537..f0ef9fa32f 100644 --- a/module/my/ui/task.html.php +++ b/module/my/ui/task.html.php @@ -18,7 +18,7 @@ featureBar ( set::current($type), set::linkParams("mode={$mode}&type={key}"), - li(searchToggle(set::module('task'))) + li(searchToggle(set::module($this->app->rawMethod . 'Task'))) ); $canBatchEdit = common::hasPriv('task', 'batchEdit'); diff --git a/module/my/ui/testcase.html.php b/module/my/ui/testcase.html.php index 072ab796d2..4aa7fbb595 100644 --- a/module/my/ui/testcase.html.php +++ b/module/my/ui/testcase.html.php @@ -15,7 +15,7 @@ featureBar ( set::current($type), set::linkParams("mode=testcase&type={key}¶m={$param}"), - li(searchToggle(set::module('testcase'))) + li(searchToggle(set::module($this->app->rawMethod . 'Testcase'))) ); $canBatchEdit = common::hasPriv('testcase', 'batchEdit'); diff --git a/module/my/ui/todo.html.php b/module/my/ui/todo.html.php index 74ba550e99..166bcb0e13 100644 --- a/module/my/ui/todo.html.php +++ b/module/my/ui/todo.html.php @@ -92,7 +92,7 @@ dtable set::checkedSummary($lang->todo->checkedSummary), set::checkInfo(jsRaw('function(checkedIDList){return window.setStatistics(this, checkedIDList);}')), set::orderBy($orderBy), - set::sortLink(createLink('my', 'todo', "type={$type}&userID={$userID}&status={$status}&orderBy={name}_{sortType}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}")), + set::sortLink(createLink('my', 'todo', "type={$type}&userID={$user->id}&status={$status}&orderBy={name}_{sortType}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}")), set::footToolbar($footToolbar), set::footPager(usePager()), set::footer(array('checkbox', 'toolbar', common::hasPriv('todo', 'import2Today') && $importFuture ? jsRaw('window.generateHtml') : '', 'checkedInfo', 'flex', 'pager')),