Merge branch 'zentaopms_258_wangyuting' into 'master'

* Fix bug. See merge request easycorp/zentaopms!6128
2022-11-14 03:17:27 +00:00
parent 461aa69449 def5bab5f4
commit e4dccd020b
1 changed files with 6 additions and 1 deletions
@@ -311,11 +311,16 @@ class buildModel extends model
        $build->stories = '';
        $build->bugs    = '';

-        if($projectID)
+        if($projectID && !$executionID)
        {
            $project = $this->loadModel('project')->getByID($projectID);
            if(!$project->multiple) $executionID = $this->dao->select('id')->from(TABLE_EXECUTION)->where('project')->eq($projectID)->fetch('id');
        }
+        else if($executionID && !$projectID)
+        {
+            $execution = $this->loadModel('execution')->getByID($executionID);
+            $projectID = $execution->project;
+        }

        $build = fixer::input('post')
            ->setDefault('project', $projectID)