* Merge for fixed code after tag in this release.

2021-08-17 17:27:42 +08:00
parent 8864fffb70
commit bb8cf72b8b
33 changed files with 153 additions and 118 deletions
@@ -2279,7 +2279,7 @@ class executionModel extends model

        $projectID = $this->dao->select('project')->from(TABLE_EXECUTION)->where('id')->eq($executionID)->fetch('project');
        $this->linkStory($executionID, $planStories, $planProducts);
-        $this->linkStory($projectID, $planStories, $planProducts);
+        if($this->config->systemMode == 'new') $this->linkStory($projectID, $planStories, $planProducts);
        if($count != 0) echo js::alert(sprintf($this->lang->execution->haveDraft, $count)) . js::locate(helper::createLink('execution', 'create', "projectID=$projectID&executionID=$executionID"));
    }

@@ -2434,7 +2434,7 @@ class executionModel extends model
        return $this->dao->select('account, role, hours')
            ->from(TABLE_TEAM)
            ->where('root')->eq($execution)
-            ->andWhere('type')->eq('execution')
+            ->andWhere('type')->in('project,execution')
            ->andWhere('account')->notIN($currentMembers)
            ->fetchAll('account');
    }