Merge pull request #10671 from hregis/8.0_mc

FIX could not create several superadmin in transversal mode
This commit is contained in:
Laurent Destailleur 2019-02-28 12:24:50 +01:00 committed by GitHub
commit c9d240cb73
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -855,7 +855,7 @@ if ($action == 'create' || $action == 'adduserldap')
print '<td>'; print '<td>';
print $form->selectyesno('admin',GETPOST('admin'),1); print $form->selectyesno('admin',GETPOST('admin'),1);
if (! empty($conf->multicompany->enabled) && ! $user->entity && empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) if (! empty($conf->multicompany->enabled) && ! $user->entity)
{ {
if (! empty($conf->use_javascript_ajax)) if (! empty($conf->use_javascript_ajax))
{ {
@ -1992,7 +1992,7 @@ else
{ {
print $form->selectyesno('admin',$object->admin,1); print $form->selectyesno('admin',$object->admin,1);
if (! empty($conf->multicompany->enabled) && ! $user->entity && empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) if (! empty($conf->multicompany->enabled) && ! $user->entity)
{ {
if ($conf->use_javascript_ajax) if ($conf->use_javascript_ajax)
{ {