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

* Fix bug #42137.

Browse Source
This commit is contained in:
hufangzhou
2023-12-22 15:32:00 +08:00
parent 4bddcc3843
commit 93992bf61d
1 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/model.php
+4 -10
View File
@@ -788,6 +788,8 @@ class executionModel extends model
$parents = array();
foreach($oldExecutions as $oldExecution) $parents[$oldExecution->id] = $oldExecution->parent;
$parentAttrs = $this->dao->select('id,attribute')->from(TABLE_PROJECT)->where('id')->in($parents)->andWhere('deleted')->eq(0)->fetchPairs('id');
/* Replace required language. */
if($this->app->tab == 'project')
{
@@ -873,16 +875,8 @@ class executionModel extends model
if(isset($project->model) and ($project->model == 'waterfall' or $project->model == 'waterfallplus'))
{
$this->app->loadLang('stage');
$attribute = $executions[$executionID]->attribute;
if(isset($attributeList[$parentID]))
{
$parentAttr = $attributeList[$parentID];
}
else
{
$parentAttr = $this->dao->select('attribute')->from(TABLE_PROJECT)->where('id')->eq($parentID)->fetch('attribute');
}
$attribute = $executions[$executionID]->attribute;
$parentAttr = $parentAttrs[$parentID];
if($parentAttr and $parentAttr != $attribute and $parentAttr != 'mix')
{