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

* Finish task #43205.

Browse Source
This commit is contained in:
liyuchun
2021-10-13 15:29:53 +08:00
parent 5cd7ed9d74
commit 9f36655aea
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/group/model.php
+6 -4
View File
@@ -364,16 +364,18 @@ class groupModel extends model
$actions['actions'] = $dynamic;
/* Update whitelist. */
$users = $this->getUserPairs($groupID);
$users = array_keys($users);
$this->loadModel('personnel');
$users = $this->getUserPairs($groupID);
$users = array_keys($users);
foreach($this->config->group->acl->objectTypes as $key => $objectType)
{
$oldAcls = isset($oldGroup->acl[$key]) ? $oldGroup->acl[$key] : array();
$newAcls = isset($actions[$key]) ? $actions[$key] : array();
$needRemoveAcls = array_diff($oldAcls, $newAcls);
$needAddAcls = array_diff($newAcls, $oldAcls);
foreach($needAddAcls as $objectID) $this->loadModel('personnel')->updateWhitelist($users, $objectType, $objectID, 'whitelist', 'add', 'increase');
foreach($needRemoveAcls as $objectID) $this->loadModel('personnel')->deleteWhitelist($users, $objectType, $objectID);
foreach($needAddAcls as $objectID) $this->personnel->updateWhitelist($users, $objectType, $objectID, 'whitelist', 'sync', 'increase');
foreach($needRemoveAcls as $objectID) $this->personnel->deleteWhitelist($users, $objectType, $objectID);
}
module/personnel/model.php
+1
View File
@@ -749,6 +749,7 @@ class personnelModel extends model
$this->dao->delete()->from(TABLE_ACL)
->where('objectID')->eq($objectID)
->andWhere('account')->in($users)
->andWhere('source')->eq('sync')
->exec();
foreach($users as $account)