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

Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'

Browse Source 
* finish task #75912#75908#75904#75919#75923#75924#76338

See merge request easycorp/zentaopms!6142
This commit is contained in:
王怡栋
2022-11-15 05:39:37 +00:00
parent 575854c7dd 72c38e942e
commit 4a18ef985d
6 changed files with 38 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/control.php
+18
View File
@@ -1733,10 +1733,28 @@ class execution extends control
$this->view->linkedBranches = $linkedBranches;
}
if(!$project->hasProduct)
{
$shadowProduct = $this->loadModel('product')->getShadowProductByProject($project->id);
$productPlan = $this->loadModel('productplan')->getPairs($shadowProduct->id, '0,0', 'noclosed,unexpired', true);
}
if(!empty($_POST))
{
if(isset($_POST['attribute']) and in_array($_POST['attribute'], array('request', 'design', 'review'))) unset($_POST['plans']);
/* No product execution link plans. */
if(!$project->hasProduct and !empty($_POST['plans']))
{
$plansItem = array();
foreach($_POST['plans'] as $planItem)
{
if(empty($planItem[0][0])) continue;
$plansItem[] = $planItem[0][0];
}
$_POST['plans'] = array($_POST['products'][0] => array(0 => $plansItem));
}
$executionID = $this->execution->create($copyExecutionID);
if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));