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

Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3

Browse Source
This commit is contained in:
wangyidong
2021-04-29 11:31:28 +08:00
parent fb21c70896 9fa83d4269
commit 180405a9d1
4 changed files with 27 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/control.php
+11 -8
View File
@@ -704,15 +704,18 @@ class bug extends control
if($bug->assignedTo == $this->app->user->account) $this->loadModel('action')->read('bug', $bugID);
/* Set menu. */
if($this->app->openApp == 'project') $this->loadModel('project')->setMenu($bug->project);
if($this->app->openApp == 'execution') $this->loadModel('execution')->setMenu($bug->execution);
if($this->app->openApp == 'qa') $this->qa->setMenu($this->products, $bug->product, $bug->branch);
if($this->app->openApp == 'devops')
if(!isonlybody())
{
session_write_close();
$repos = $this->loadModel('repo')->getRepoPairs($bug->project);
$this->repo->setMenu($repos);
$this->lang->navGroup->bug = 'devops';
if($this->app->openApp == 'project') $this->loadModel('project')->setMenu($bug->project);
if($this->app->openApp == 'execution') $this->loadModel('execution')->setMenu($bug->execution);
if($this->app->openApp == 'qa') $this->qa->setMenu($this->products, $bug->product, $bug->branch);
if($this->app->openApp == 'devops')
{
session_write_close();
$repos = $this->loadModel('repo')->getRepoPairs($bug->project);
$this->repo->setMenu($repos);
$this->lang->navGroup->bug = 'devops';
}
}
/* Get product info. */
module/testcase/view/view.html.php
+1 -1
View File
@@ -243,7 +243,7 @@
<th><?php echo $lang->testcase->status;?></th>
<td>
<?php
echo $this->processStatus($from != 'testtask' ? 'testcase' : 'testtask', $case);
echo $this->processStatus('testcase', $case);
if($case->version > $case->currentVersion and $from == 'testtask')
{
echo "(<span class='warning' title={$lang->testcase->fromTesttask}>{$lang->testcase->changed}</span> ";
module/testtask/model.php
+1 -1
View File
@@ -861,7 +861,7 @@ class testtaskModel extends model
$row->case = $caseID;
$row->version = $postData->versions[$caseID];
$row->assignedTo = '';
$row->status = 'wait';
$row->status = 'normal';
if($type == 'bybuild') $row->assignedTo = zget($assignedToPairs, $caseID, '');
$this->dao->replace(TABLE_TESTRUN)->data($row)->exec();
module/upgrade/model.php
+14
View File
@@ -650,6 +650,7 @@ class upgradeModel extends model
case '15_0_rc3':
$this->saveLogs('Execute 15_0_rc3');
$this->updateLibType();
$this->updateRunCaseStatus();
$this->appendExec('15_0_rc3');
}
@@ -4927,4 +4928,17 @@ class upgradeModel extends model
return true;
}
/**
* Update the testtask related cases status.
*
* @access public
* @return bool
*/
public function updateRunCaseStatus()
{
$this->dao->update(TABLE_TESTRUN)->set('status')->eq('normal')->where('status')->in('wait,done')->exec();
return true;
}
}