Merge branch 'zhouxin_bug_30548' into 'master'

* Fix bug #30548.

See merge request easycorp/zentaopms!6474
This commit is contained in:
孙广明
2022-12-06 05:53:49 +00:00
+5 -1
View File
@@ -163,13 +163,17 @@ class transfer extends control
if($product->type == 'normal') unset($fields['branch']);
if($this->session->storyType == 'requirement') unset($fields['plan']);
}
if($model == 'bug')
{
$product = $this->loadModel('product')->getByID($this->session->bugTransferParams['productID']);
if($product->type == 'normal') unset($fields['branch']);
if($product->shadow and ($this->app->tab == 'execution' or $this->app->tab == 'project')) unset($fields['product']);
}
if($model == 'testcase')
{
$product = $this->loadModel('product')->getByID($this->session->testcaseTransferParams['productID']);
if($product->type == 'normal') unset($fields['branch']);
}
if($model == 'task') $datas = $this->task->processDatas4Task($datas);
$html = $this->transfer->buildNextList($datas->datas, $lastID, $fields, $pagerID, $model);
die($html);