Merge branch '15.4'

2021-09-02 19:21:30 +08:00
parent 28be8dbc61 3fb14ef213
commit 4eee4d5523
35 changed files with 228 additions and 146 deletions
@@ -3122,9 +3122,12 @@ class execution extends control
                }
                $planProducts[$story->id] = $story->product;
            }
+
+            $projectID   = $this->dao->findByID($executionID)->from(TABLE_EXECUTION)->fetch('project');
            $planStories = array_keys($planStory);
+
            $this->execution->linkStory($executionID, $planStories, $planProducts);
-            if($executionID != $this->session->project) $this->execution->linkStory($this->session->project, $planStories, $planProducts);
+            if($this->config->systemMode == 'new' and $executionID != $projectID) $this->execution->linkStory($projectID, $planStories, $planProducts);
        }

        $moduleName = 'execution';