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

Merge branch 'sprint/167_liyuchun_15541' into 'sprint/167'

Browse Source 
* Fix bug #15541.

See merge request easycorp/zentaopms!83
This commit is contained in:
孙广明
2021-10-19 06:44:48 +00:00
parent 2f123ce5ab c7e3f11892
commit 7155161701
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/group/model.php
+7 -4
View File
@@ -381,10 +381,11 @@ class groupModel extends model
/* Update whitelist. */
$this->loadModel('personnel');
$users = $this->getUserPairs($groupID);
$users = array_keys($users);
$users = $this->getUserPairs($groupID);
$users = array_keys($users);
$objectTypes = array_reverse($this->config->group->acl->objectTypes); //Adjust the order of object types, because execution is subordinate to the whitelist of projects, as well as products to programs.
foreach($this->config->group->acl->objectTypes as $key => $objectType)
foreach($objectTypes as $key => $objectType)
{
$oldAcls = isset($oldGroup->acl[$key]) ? $oldGroup->acl[$key] : array();
$newAcls = isset($actions[$key]) ? $actions[$key] : array();
@@ -456,7 +457,9 @@ class groupModel extends model
$acl = json_decode($acl);
$this->loadModel('personnel');
foreach($this->config->group->acl->objectTypes as $key => $objectType)
$objectTypes = array_reverse($this->config->group->acl->objectTypes); //Adjust the order of object types, because execution is subordinate to the whitelist of projects, as well as products to programs.
foreach($objectTypes as $key => $objectType)
{
if(!isset($acl->{$key})) continue;
foreach($acl->{$key} as $objectID)