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

2023-02-07 11:06:54 +08:00
parent 26c0c5e9dc 5719c8c252
commit 9b78ff909b
3 changed files with 9 additions and 1 deletions
@@ -1657,6 +1657,11 @@ class executionModel extends model
                if($execution->parent < 0 and $execution->type == 'stage') unset($executions[$key]);
                if($execution->projectName) $execution->name = $execution->projectName . ' / ' . $execution->name;
            }
+            elseif($param === 'hasParentName')
+            {
+                $parentExecutions = $this->dao->select('id,name')->from(TABLE_EXECUTION)->where('id')->in(trim($execution->path, ','))->andWhere('type')->in('stage,kanban,sprint')->orderBy('grade')->fetchPairs();
+                $executions[$execution->id]->name  = implode('/', $parentExecutions);
+            }
            else
            {
                if(isset($executions[$execution->parent]) and $execution->type == 'stage')