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

* Fix bug #11049.

Browse Source
This commit is contained in:
holan20180123
2021-03-29 11:29:45 +08:00
parent 9a20e0d207
commit f5a667ce24
3 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/upgrade/control.php
+2 -2
View File
@@ -164,8 +164,8 @@ class upgrade extends control
$mode = fixer::input('post')->get('mode');
$this->loadModel('setting')->setItem('system.common.global.mode', $mode);
if($mode == 'old') $this->locate(inlink('afterExec', "fromVersion=$fromVersion"));
if($mode == 'new') $this->locate(inlink('mergeTips'));
if($mode == 'classic') $this->locate(inlink('afterExec', "fromVersion=$fromVersion"));
if($mode == 'new') $this->locate(inlink('mergeTips'));
}
$this->view->title = $this->lang->upgrade->to15Guide;
module/user/model.php
+2 -1
View File
@@ -1025,10 +1025,11 @@ class userModel extends model
*/
public function getExecutions($account, $type = 'execution', $status = 'all', $orderBy = 'id_desc', $pager = null)
{
if($type == 'execution') $type = 'sprint,stage';
$projectType = $type == 'execution' ? 'sprint,stage' : $type;
$myProjectsList = $this->dao->select('t1. *,t2. *')->from(TABLE_TEAM)->alias('t1')
->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.root = t2.id')
->where('t1.type')->in($type)
->andWhere('t2.type')->in($projectType)
->beginIF(strpos('doing|wait|suspended|closed', $status) !== false)->andWhere('status')->eq($status)->fi()
->beginIF($status == 'done')->andWhere('status')->in('done,closed')->fi()
->beginIF($status == 'undone')->andWhere('status')->notin('done,closed')->fi()
module/user/view/featurebar.html.php
+6 -3
View File
@@ -39,9 +39,12 @@
$active = $methodName == 'testcase' ? ' btn-active-text' : '';
common::printLink('user', 'testcase', "userID={$user->id}", $label, '', "class='btn btn-link $active'");
$label = "<span class='text'>{$lang->user->execution}</span>";
$active = $methodName == 'execution' ? ' btn-active-text' : '';
common::printLink('user', 'execution', "userID={$user->id}", $label, '', "class='btn btn-link $active'");
if($this->config->systemMode == 'new')
{
$label = "<span class='text'>{$lang->user->execution}</span>";
$active = $methodName == 'execution' ? ' btn-active-text' : '';
common::printLink('user', 'execution', "userID={$user->id}", $label, '', "class='btn btn-link $active'");
}
if(isset($this->config->maxVersion))
{