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

* Fix bug #15541.

Browse Source
This commit is contained in:
tianshujie
2021-10-15 13:57:42 +08:00
parent d9ffc89d5e
commit ae5003bde1
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/personnel/model.php
+14 -8
View File
@@ -622,10 +622,13 @@ class personnelModel extends model
$product = $this->loadModel('product')->getById($objectID);
if(empty($product)) return false;
$programWhitelist = $this->getWhitelistAccount($product->program, 'program');
$newWhitelist = array_merge($programWhitelist, $accounts);
$source = $source == 'upgrade' ? 'upgrade' : 'sync';
$this->updateWhitelist($newWhitelist, 'program', $product->program, 'whitelist', $source, $updateType);
if($this->config->systemMode == 'new')
{
$programWhitelist = $this->getWhitelistAccount($product->program, 'program');
$newWhitelist = array_merge($programWhitelist, $accounts);
$source = $source == 'upgrade' ? 'upgrade' : 'sync';
$this->updateWhitelist($newWhitelist, 'program', $product->program, 'whitelist', $source, $updateType);
}
/* Removal of persons from centralized program whitelisting. */
if($updateType == 'replace')
@@ -640,10 +643,13 @@ class personnelModel extends model
$sprint = $this->dao->select('id,project')->from(TABLE_PROJECT)->where('id')->eq($objectID)->fetch();
if(empty($sprint)) return false;
$projectWhitelist = $this->getWhitelistAccount($sprint->project, 'project');
$newWhitelist = array_merge($projectWhitelist, $accounts);
$source = $source == 'upgrade' ? 'upgrade' : 'sync';
$this->updateWhitelist($newWhitelist, 'project', $sprint->project, 'whitelist', $source, $updateType);
if($this->config->systemMode == 'new')
{
$projectWhitelist = $this->getWhitelistAccount($sprint->project, 'project');
$newWhitelist = array_merge($projectWhitelist, $accounts);
$source = $source == 'upgrade' ? 'upgrade' : 'sync';
$this->updateWhitelist($newWhitelist, 'project', $sprint->project, 'whitelist', $source, $updateType);
}
/* Removal of whitelisted persons from projects. */
if($updateType == 'replace')