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

* Fix bug#39041.

Browse Source
This commit is contained in:
zhujinyong
2023-09-27 17:28:57 +08:00
parent 87f2bfb26d
commit 6448310cc0
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/group/model.php
+9 -5
View File
@@ -2367,10 +2367,11 @@ class groupModel extends model
*
* @param array $depends
* @param array $privs
* @param array $excludes
* @access protected
* @return array
*/
protected function processDepends($depends, $privs)
protected function processDepends($depends, $privs, $excludes)
{
foreach($privs as $priv)
{
@@ -2378,12 +2379,15 @@ class groupModel extends model
foreach($depends[$priv] as $dependPriv)
{
if(isset($privs[$dependPriv])) continue;
if(isset($privs[$dependPriv]) || in_array($dependPriv, $excludes)) continue;
$privs[$dependPriv] = $dependPriv;
$dependPrivs = $this->processDepends($depends, $depends[$dependPriv]);
$dependPrivs = $this->processDepends($depends, $depends[$dependPriv], $excludes);
foreach($dependPrivs as $depend) $privs[$depend] = $depend;
foreach($dependPrivs as $depend)
{
if(!in_array($depend, $excludes)) $privs[$depend] = $depend;
}
}
}
@@ -2430,7 +2434,7 @@ class groupModel extends model
}
/* Process circular dependency. */
$relatedPrivs['depend'] = $this->processDepends($depends, $relatedPrivs['depend']);
$relatedPrivs['depend'] = $this->processDepends($depends, $relatedPrivs['depend'], $selectedPrivList);
$subsetPrivs = array('depend' => array(), 'recommend' => array());
foreach(array('depend', 'recommend') as $type)