lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #12447 from hregis/develop_mc

Browse Source 
FIX better look compatibility with Multicompany
This commit is contained in:
Laurent Destailleur 2019-11-16 00:49:37 +01:00 committed by GitHub
commit 07be51c2fc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
htdocs/user/card.php
View File

@ -2005,6 +2005,13 @@ else
} }
} }
// Other form for add user to group
$parameters = array('caneditgroup' => $caneditgroup, 'groupslist' => $groupslist, 'exclude' => $exclude);
$reshook = $hookmanager->executeHooks('formAddUserToGroup', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
print $hookmanager->resPrint;
if (empty($reshook))
{
if ($caneditgroup) if ($caneditgroup)
{ {
print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$id.'" method="POST">'."\n"; print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$id.'" method="POST">'."\n";
@ -2013,14 +2020,6 @@ else
} }
print '<table class="noborder centpercent">'."\n"; print '<table class="noborder centpercent">'."\n";
// Other form for add user to group
$parameters = array('caneditgroup' => $caneditgroup, 'groupslist' => $groupslist, 'exclude' => $exclude);
$reshook = $hookmanager->executeHooks('formAddUserToGroup', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
print $hookmanager->resPrint;
if (empty($reshook))
{
print '<tr class="liste_titre"><th class="liste_titre">'.$langs->trans("Groups").'</th>'."\n"; print '<tr class="liste_titre"><th class="liste_titre">'.$langs->trans("Groups").'</th>'."\n";
print '<th class="liste_titre right">'; print '<th class="liste_titre right">';
if ($caneditgroup) if ($caneditgroup)
@ -2068,7 +2067,6 @@ else
{ {
print '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td></tr>'; print '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
} }
}
print "</table>"; print "</table>";
@ -2080,6 +2078,7 @@ else
} }
} }
} }
}
/* /*
* Fiche en mode edition * Fiche en mode edition