Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Adjust for show search box.

Browse Source
This commit is contained in:
wangyidong
2023-10-24 14:38:09 +08:00
parent 6fec5bc536
commit a78e7b74d7
10 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
extension/lite/execution/ext/model/lite.php
+3 -3
View File
@@ -1,5 +1,5 @@
<?php
public function setMenu($executionID, $buildID = 0, $extra = '')
public function setMenu(int $executionID, int $buildID = 0, string $extra = '')
{
common::setMenuVars('execution', $executionID);
@@ -76,7 +76,7 @@ public function setMenu($executionID, $buildID = 0, $extra = '')
$this->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;
module/my/control.php
-1
View File
@@ -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;
module/my/model.php
+4 -4
View File
@@ -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;
module/my/ui/bug.html.php
+1 -1
View File
@@ -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';
module/my/ui/doc.html.php
+1 -1
View File
@@ -18,7 +18,7 @@ featureBar
(
set::current($type),
set::linkParams("mode=doc&type={key}&param={$param}"),
li(searchToggle(set::module('doc')))
li(searchToggle(set::module('contributeDoc')))
);
if($type == 'openedbyme') unset($config->my->doc->dtable->fieldList['addedBy']);
module/my/ui/requirement.html.php
+1 -1
View File
@@ -14,7 +14,7 @@ featureBar
(
set::current($type),
set::linkParams("mode=requirement&type={key}&param={$param}"),
li(searchToggle(set::module('story')))
li(searchToggle(set::module($this->app->rawMethod . 'Requirement')))
);
$canBatchEdit = common::hasPriv('story', 'batchEdit');
module/my/ui/story.html.php
+1 -1
View File
@@ -16,7 +16,7 @@ featureBar
(
set::current($type),
set::linkParams("mode=story&type={key}&param={$param}"),
li(searchToggle(set::module('story')))
li(searchToggle(set::module($this->app->rawMethod . 'Story')))
);
$canBatchEdit = common::hasPriv('story', 'batchEdit');
module/my/ui/task.html.php
+1 -1
View File
@@ -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');
module/my/ui/testcase.html.php
+1 -1
View File
@@ -15,7 +15,7 @@ featureBar
(
set::current($type),
set::linkParams("mode=testcase&type={key}&param={$param}"),
li(searchToggle(set::module('testcase')))
li(searchToggle(set::module($this->app->rawMethod . 'Testcase')))
);
$canBatchEdit = common::hasPriv('testcase', 'batchEdit');
module/my/ui/todo.html.php
+1 -1
View File
@@ -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')),