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

Add combo on ldap selection

Browse Source
This commit is contained in:
Laurent Destailleur 2017-08-25 15:04:55 +02:00
parent 999ac8eccd
commit 7030d0d596
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
htdocs/user/card.php
View File

@ -369,7 +369,7 @@ if (empty($reshook)) {
$object->default_range = GETPOST('default_range'); $object->default_range = GETPOST('default_range');
$object->default_c_exp_tax_cat = GETPOST('default_c_exp_tax_cat'); $object->default_c_exp_tax_cat = GETPOST('default_c_exp_tax_cat');
if (! empty($conf->multicompany->enabled)) if (! empty($conf->multicompany->enabled))
{ {
if (! empty($_POST["superadmin"])) if (! empty($_POST["superadmin"]))
@ -718,6 +718,7 @@ if ($action == 'create' || $action == 'adduserldap')
if (is_array($liste) && count($liste)) if (is_array($liste) && count($liste))
{ {
print $form->selectarray('users', $liste, '', 1); print $form->selectarray('users', $liste, '', 1);
print ajax_combobox('users');
} }
print '</td><td align="center">'; print '</td><td align="center">';
print '<input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans('Get')).'"'.(count($liste)?'':' disabled').'>'; print '<input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans('Get')).'"'.(count($liste)?'':' disabled').'>';
@ -1111,7 +1112,7 @@ if ($action == 'create' || $action == 'adduserldap')
null, '90%' ); null, '90%' );
print "</td></tr>"; print "</td></tr>";
} }
if (!empty($conf->global->MAIN_USE_EXPENSE_IK)) if (!empty($conf->global->MAIN_USE_EXPENSE_IK))
{ {
print '<tr><td>'.$langs->trans("DefaultCategoryCar").'</td>'; print '<tr><td>'.$langs->trans("DefaultCategoryCar").'</td>';
@ -1125,7 +1126,7 @@ if ($action == 'create' || $action == 'adduserldap')
print $form->selectarray('default_range', range(0, $maxRangeNum), $object->default_range); print $form->selectarray('default_range', range(0, $maxRangeNum), $object->default_range);
print '</td></tr>'; print '</td></tr>';
} }
// Other attributes // Other attributes
$parameters=array('objectsrc' => $objectsrc, 'colspan' => ' colspan="3"'); $parameters=array('objectsrc' => $objectsrc, 'colspan' => ' colspan="3"');
$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook
@ -1143,7 +1144,7 @@ if ($action == 'create' || $action == 'adduserldap')
$doleditor=new DolEditor('note','','',120,'dolibarr_notes','',false,true,$conf->global->FCKEDITOR_ENABLE_SOCIETE,ROWS_3,'90%'); $doleditor=new DolEditor('note','','',120,'dolibarr_notes','',false,true,$conf->global->FCKEDITOR_ENABLE_SOCIETE,ROWS_3,'90%');
$doleditor->Create(); $doleditor->Create();
print "</td></tr>\n"; print "</td></tr>\n";
// Signature // Signature
print '<tr><td class="tdtop">'.$langs->trans("Signature").'</td>'; print '<tr><td class="tdtop">'.$langs->trans("Signature").'</td>';
print '<td>'; print '<td>';
@ -1527,7 +1528,7 @@ else
print $object->default_range; print $object->default_range;
print '</td></tr>'; print '</td></tr>';
} }
// Other attributes // Other attributes
include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php'; include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
@ -2428,14 +2429,14 @@ else
print '<td>'; print '<td>';
print $form->selectExpenseCategories($object->default_c_exp_tax_cat, 'default_c_exp_tax_cat', 1); print $form->selectExpenseCategories($object->default_c_exp_tax_cat, 'default_c_exp_tax_cat', 1);
print '</td></tr>'; print '</td></tr>';
print '<tr><td>'.$langs->trans("DefaultRangeNumber").'</td>'; print '<tr><td>'.$langs->trans("DefaultRangeNumber").'</td>';
print '<td>'; print '<td>';
$maxRangeNum = ExpenseReportIk::getMaxRangeNumber($object->default_c_exp_tax_cat); $maxRangeNum = ExpenseReportIk::getMaxRangeNumber($object->default_c_exp_tax_cat);
print $form->selectarray('default_range', range(0, $maxRangeNum), $object->default_range); print $form->selectarray('default_range', range(0, $maxRangeNum), $object->default_range);
print '</td></tr>'; print '</td></tr>';
} }
// Other attributes // Other attributes
$parameters=array('colspan' => ' colspan="2"'); $parameters=array('colspan' => ' colspan="2"');
$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook