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

Fix: regression (multicompany)

Browse Source
This commit is contained in:
Regis Houssin 2012-08-01 12:58:19 +02:00
parent da44fa7186
commit 29fea7bbf4
3 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/class/html.form.class.php
View File

@ -3755,7 +3755,7 @@ class Form
* @param int $force_entity Possibility to force entity
* @return void
*/
function select_dolgroups($selected='',$htmlname='groupid',$show_empty=0,$exclude='',$disabled=0,$include='',$enableonly='',$force_entity='')
function select_dolgroups($selected='', $htmlname='groupid', $show_empty=0, $exclude='', $disabled=0, $include='', $enableonly='', $force_entity='')
{
global $conf,$user,$langs;

18
htdocs/user/fiche.php
View File

@ -1313,15 +1313,15 @@ else
$usergroup=new UserGroup($db);
$groupslist = $usergroup->listGroupsForUser($fuser->id);
if (! empty($conf->multicompany->enabled) && ! empty($conf->multicompany->transverse_mode))
if (! empty($groupslist))
{
if (! empty($groupslist))
{
foreach($groupslist as $groupforuser)
{
$exclude[]=$groupforuser->id;
}
}
if (! ($conf->multicompany->enabled && $conf->multicompany->transverse_mode))
{
foreach($groupslist as $groupforuser)
{
$exclude[]=$groupforuser->id;
}
}
}
if ($caneditgroup)
@ -1333,7 +1333,7 @@ else
print '<table class="noborder" width="100%">'."\n";
print '<tr class="liste_titre"><th class="liste_titre" width="25%">'.$langs->trans("GroupsToAdd").'</th>'."\n";
print '<th>';
print $form->select_dolgroups('','group',1,$exclude,0,'','',$fuser->entity);
print $form->select_dolgroups('', 'group', 1, $exclude, 0, '', '', $fuser->entity);
print ' &nbsp; ';
// Multicompany
if (! empty($conf->multicompany->enabled))

16
htdocs/user/group/fiche.php
View File

@ -350,15 +350,15 @@ else
// On selectionne les users qui ne sont pas deja dans le groupe
$exclude = array();
if (! empty($conf->multicompany->enabled) && ! empty($conf->multicompany->transverse_mode))
if (! empty($object->members))
{
if (! empty($object->members))
{
foreach($object->members as $useringroup)
{
$exclude[]=$useringroup->id;
}
}
if (! ($conf->multicompany->enabled && $conf->multicompany->transverse_mode))
{
foreach($object->members as $useringroup)
{
$exclude[]=$useringroup->id;
}
}
}
if ($caneditperms)