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

Merge branch 'master' into 'sprint/174_tianshujie_45081'

Browse Source 
# Conflicts:
#   module/product/control.php
#   module/story/view/batchedit.html.php
This commit is contained in:
李玉春
2021-11-29 08:03:38 +00:00
parent adb2c12935 3050ba859d
commit a99419f0c5
109 changed files with 1292 additions and 485 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/model.php
+5 -2
View File
@@ -549,8 +549,11 @@ class executionModel extends model
}
if(isset($execution->project) and $execution->project) $this->addProjectMembers($execution->project, $teamMembers);
$whitelist = explode(',', $execution->whitelist);
$this->loadModel('personnel')->updateWhitelist($whitelist, 'sprint', $executionID);
if(!empty($execution->whitelist))
{
$whitelist = explode(',', $execution->whitelist);
$this->loadModel('personnel')->updateWhitelist($whitelist, 'sprint', $executionID);
}
/* Fix bug#3074, Update views for team members. */
if($execution->acl != 'open') $this->updateUserView($executionID, 'sprint', $changedAccounts);