Merge pull request #9094 from atm-ph/fix_7.0_getrights

Fix user rights overrided by user group rights
This commit is contained in:
Laurent Destailleur 2018-07-15 19:58:00 +02:00 committed by GitHub
commit cb0553c3bf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -804,7 +804,8 @@ class User extends CommonObject
else
{
if(empty($this->rights->$module->$perms)) $this->nb_rights++;
$this->rights->$module->$perms = 1;
// if we have already define a subperm like this $this->rights->$module->level1->level2 with llx_user_rights, we don't want override level1 because the level2 can be not define on user group
if (!is_object($this->rights->$module->$perms)) $this->rights->$module->$perms = 1;
}
}