Merge pull request #12447 from hregis/develop_mc

FIX better look compatibility with Multicompany
Dolibarr · Nov 15, 2019 · 07be51c · 07be51c
2 parents 8f9ad0c + bb8a4e9
commit 07be51c
Showing 1 changed file with 14 additions and 15 deletions.
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
@@ -2005,22 +2005,21 @@
 						}
 					}
 
-					if ($caneditgroup)
-					{
-						print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$id.'" method="POST">'."\n";
-						print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'" />';
-						print '<input type="hidden" name="action" value="addgroup" />';
-					}
-
-					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))
 					{
+						if ($caneditgroup)
+						{
+							print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$id.'" method="POST">'."\n";
+							print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'" />';
+							print '<input type="hidden" name="action" value="addgroup" />';
+						}
+
+						print '<table class="noborder centpercent">'."\n";
 						print '<tr class="liste_titre"><th class="liste_titre">'.$langs->trans("Groups").'</th>'."\n";
 						print '<th class="liste_titre right">';
 						if ($caneditgroup)
@@ -2068,15 +2067,15 @@
 						{
 							print '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
 						}
-					}
 
-					print "</table>";
+						print "</table>";
 
-					if ($caneditgroup)
-					{
-						print '</form>';
+						if ($caneditgroup)
+						{
+							print '</form>';
+						}
+						print "<br>";
 					}
-					print "<br>";
 				}
 			}
 		}