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

Merge branch 'zentaopms_239_wangyuting' into 'zentaopms_239'

Browse Source 
* Fix systemMode bug.

See merge request easycorp/zentaopms!5710
This commit is contained in:
王怡栋
2022-10-10 09:18:50 +00:00
parent 9a32b08644 aa9bc2b8ec
commit abcdde7ea3
107 changed files with 239 additions and 522 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/testcase/model.php
+3 -3
View File
@@ -58,7 +58,7 @@ class testcaseModel extends model
->add('fromBug', $bugID)
->setDefault('openedBy', $this->app->user->account)
->setDefault('openedDate', $now)
->setIF($this->config->systemMode == 'new' and $this->app->tab == 'project', 'project', $this->session->project)
->setIF($this->app->tab == 'project', 'project', $this->session->project)
->setIF($this->app->tab == 'execution', 'execution', $this->session->execution)
->setIF($this->post->story != false, 'storyVersion', $this->loadModel('story')->getVersion((int)$this->post->story))
->stripTags($this->config->testcase->editor->create['id'], $this->config->allowedTags)
@@ -165,7 +165,7 @@ class testcaseModel extends model
$data[$i] = new stdclass();
$data[$i]->product = $productID;
if($this->config->systemMode == 'new' && $this->app->tab == 'project') $data[$i]->project = $this->session->project;
if($this->app->tab == 'project') $data[$i]->project = $this->session->project;
$data[$i]->branch = $cases->branch[$i];
$data[$i]->module = $cases->module[$i];
$data[$i]->type = $cases->type[$i];
@@ -1543,7 +1543,7 @@ class testcaseModel extends model
}
else
{
if($this->config->systemMode == 'new' && $this->app->tab == 'project') $caseData->project = $this->session->project;
if($this->app->tab == 'project') $caseData->project = $this->session->project;
$caseData->version = 1;
$caseData->openedBy = $this->app->user->account;
$caseData->openedDate = $now;