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

Fix conflict

Browse Source
This commit is contained in:
wdammak 2019-02-15 05:32:01 +01:00 committed by GitHub
parent 4dc4a25bb5
commit fd4f82b1b7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
htdocs/user/card.php
View File

@ -1110,8 +1110,7 @@ if ($action == 'create' || $action == 'adduserldap')
{ {
print '<tr><td>' . $form->editfieldkey('Categories', 'usercats', '', $object, 0) . '</td><td colspan="3">'; print '<tr><td>' . $form->editfieldkey('Categories', 'usercats', '', $object, 0) . '</td><td colspan="3">';
$cate_arbo = $form->select_all_categories('user', null, 'parent', null, null, 1); $cate_arbo = $form->select_all_categories('user', null, 'parent', null, null, 1);
print $form->multiselectarray('usercats', $cate_arbo, GETPOST('usercats', 'array'), null, null, null, print $form->multiselectarray('usercats', $cate_arbo, GETPOST('usercats', 'array'), null, null, null, null, '90%');
null, '90%' );
print "</td></tr>"; print "</td></tr>";
} }
@ -1630,9 +1629,9 @@ else
// Categories // Categories
if (! empty($conf->categorie->enabled) && ! empty($user->rights->categorie->lire)) if (! empty($conf->categorie->enabled) && ! empty($user->rights->categorie->lire))
{ {
print '<tr><td>' . $langs->trans( "Categories" ) . '</td>'; print '<tr><td>' . $langs->trans("Categories") . '</td>';
print '<td colspan="3">'; print '<td colspan="3">';
print $form->showCategories( $object->id, 'user', 1 ); print $form->showCategories($object->id, 'user', 1);
print '</td></tr>'; print '</td></tr>';
} }
@ -2397,21 +2396,21 @@ else
print '</tr>'; print '</tr>';
// Categories // Categories
if (!empty( $conf->categorie->enabled ) && !empty( $user->rights->categorie->lire )) if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire))
{ {
print '<tr><td>' . $form->editfieldkey('Categories', 'usercats', '', $object, 0) . '</td>'; print '<tr><td>' . $form->editfieldkey('Categories', 'usercats', '', $object, 0) . '</td>';
print '<td>'; print '<td>';
$cate_arbo = $form->select_all_categories( Categorie::TYPE_USER, null, null, null, null, 1 ); $cate_arbo = $form->select_all_categories(Categorie::TYPE_USER, null, null, null, null, 1);
$c = new Categorie( $db ); $c = new Categorie($db);
$cats = $c->containing($object->id, Categorie::TYPE_USER); $cats = $c->containing($object->id, Categorie::TYPE_USER);
foreach ($cats as $cat) { foreach ($cats as $cat) {
$arrayselected[] = $cat->id; $arrayselected[] = $cat->id;
} }
if ($caneditfield) if ($caneditfield)
{ {
print $form->multiselectarray( 'usercats', $cate_arbo, $arrayselected, '', 0, '', 0, '90%' ); print $form->multiselectarray('usercats', $cate_arbo, $arrayselected, '', 0, '', 0, '90%');
}else{ }else{
print $form->showCategories( $object->id, 'user', 1 ); print $form->showCategories($object->id, 'user', 1);
} }
print "</td></tr>"; print "</td></tr>";
} }