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

* fix bug for merge rights.

Browse Source
This commit is contained in:
wangyidong
2016-06-01 16:12:07 +08:00
parent 841bf08e6e
commit 1a68eb4249
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/user/model.php
+2 -3
View File
@@ -688,15 +688,14 @@ class userModel extends model
break;
}
$acl = json_decode($group->acl, true);
if(empty($acl['products'])) $productAllow = true;
if(empty($acl['projects'])) $projectAllow = true;
if(empty($acls) and !empty($acl))
{
$acls = $acl;
continue;
}
if(empty($acl['products'])) $productAllow = true;
if(empty($acl['projects'])) $projectAllow = true;
if(!empty($acl['views'])) $acls['views'] = array_merge($acls['views'], $acl['views']);
if(!empty($acl['products'])) $acls['products'] = !empty($acls['products']) ? array_merge($acls['products'], $acl['products']) : $acl['products'];
if(!empty($acl['projects'])) $acls['projects'] = !empty($acls['projects']) ? array_merge($acls['projects'], $acl['projects']) : $acl['projects'];