Merge pull request #8234 from hregis/7.0_entity
Fix: multicompany transverse mode is managed by the module
This commit is contained in:
commit
75962f5ed1
@ -67,9 +67,7 @@ if (! empty($conf->global->MAIN_USE_ADVANCED_PERMS))
|
|||||||
$canreadgroup=(! empty($user->admin) || $user->rights->user->group_advance->read);
|
$canreadgroup=(! empty($user->admin) || $user->rights->user->group_advance->read);
|
||||||
$caneditgroup=(! empty($user->admin) || $user->rights->user->group_advance->write);
|
$caneditgroup=(! empty($user->admin) || $user->rights->user->group_advance->write);
|
||||||
}
|
}
|
||||||
if(! empty($conf->multicompany->enabled) && ! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
|
|
||||||
$caneditgroup = ($conf->entity == 1) && ! empty($user->admin) && empty($user->entity);
|
|
||||||
}
|
|
||||||
// Define value to know what current user can do on properties of edited user
|
// Define value to know what current user can do on properties of edited user
|
||||||
if ($id)
|
if ($id)
|
||||||
{
|
{
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user