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

Merge branch 'sprint/lmy_task' into 'master'

Browse Source 
* Finish task #85455, #85456.

See merge request easycorp/zentaopms!7066
This commit is contained in:
孙广明
2023-02-24 07:20:22 +00:00
parent d0c8ef4430 6cfeb9e928
commit 2fdd4f704a
5 changed files with 29 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/control.php
+2 -1
View File
@@ -506,9 +506,10 @@ class execution extends control
$execution = $this->commonAction($toExecution);
$toExecution = $execution->id;
$project = $this->loadModel('project')->getByID($execution->project);
$branches = $this->execution->getBranches($toExecution);
$tasks = $this->execution->getTasks2Imported($toExecution, $branches);
$executions = $this->execution->getToImport(array_keys($tasks), $execution->type);
$executions = $this->execution->getToImport(array_keys($tasks), $execution->type, $project->model);
unset($executions[$toExecution]);
unset($tasks[$toExecution]);