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

Fixed: bad place for the ajaxcombo.

Browse Source
This commit is contained in:
Laurent Destailleur 2014-12-20 11:15:10 +01:00
parent d8838f9438
commit 854ed90a62
4 changed files with 20 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1342,6 +1342,12 @@ class Form
$out.= '<option value="">'.$langs->trans("None").'</option>'; $out.= '<option value="">'.$langs->trans("None").'</option>';
} }
$out.= '</select>'; $out.= '</select>';
if (! empty($conf->use_javascript_ajax))
{
include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
$out.= ajax_combobox($htmlname);
}
} }
else else
{ {
@ -4566,10 +4572,17 @@ class Form
} }
else else
{ {
$out.= '<select class="flat" name="'.$htmlname.'" disabled="disabled">'; $out.= '<select class="flat" name="'.$htmlname.'"'.($show_empty?'':' disabled="disabled"').'>';
$out.= '<option value="">'.$langs->trans("None").'</option>'; if ($show_empty) $out.= '<option value="-1"'.($selected==-1?' selected="selected"':'').'>&nbsp;</option>'."\n";
$out.= '<option value="" disabled="disabled">'.$langs->trans("NoUserGroupDefined").'</option>';
} }
$out.= '</select>'; $out.= '</select>';
if (! empty($conf->use_javascript_ajax))
{
include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
$out.= ajax_combobox($htmlname);
}
} }
else else
{ {

25
htdocs/core/lib/agenda.lib.php
View File

@ -70,36 +70,13 @@ function print_actions_filter($form, $canedit, $status, $year, $month, $day, $sh
{ {
print '<tr>'; print '<tr>';
print '<td class="nowrap">'; print '<td class="nowrap">';
//print $langs->trans("ActionsAskedBy");
//print ' &nbsp;</td><td class="nowrap maxwidthonsmartphone">';
//print $form->select_dolusers($filtera, 'userasked', 1, '', ! $canedit);
//print ' &nbsp; '.$langs->trans("or") . ' ';
print $langs->trans("ActionsOwnedBy").' &nbsp; '; print $langs->trans("ActionsOwnedBy").' &nbsp; ';
print '</td><td class="nowrap maxwidthonsmartphone">'; print '</td><td class="nowrap maxwidthonsmartphone">';
//print $langs->trans("User");
print $form->select_dolusers($filtert, 'usertodo', 1, '', ! $canedit); print $form->select_dolusers($filtert, 'usertodo', 1, '', ! $canedit);
if (! empty($conf->use_javascript_ajax)) if (empty($conf->dol_optimize_smallscreen)) print ' &nbsp; '.$langs->trans("or") . ' '.$langs->trans("Group").' &nbsp; ';
{
include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
print ajax_combobox('usertodo');
}
if (empty($conf->dol_optimize_smallscreen)) print ' &nbsp; '.$langs->trans("or") . ' ';
else print '<br>';
print $langs->trans("Group").' &nbsp; ';
print $form->select_dolgroups($usergroupid, 'usergroup', 1, '', ! $canedit); print $form->select_dolgroups($usergroupid, 'usergroup', 1, '', ! $canedit);
if (! empty($conf->use_javascript_ajax))
{
print ajax_combobox('usergroup');
}
print '</td></tr>'; print '</td></tr>';
/*print '<tr>';
print '<td class="nowrap">';
print $langs->trans("or") . ' ' . $langs->trans("ActionsDoneBy");
print ' &nbsp;</td><td class="nowrap maxwidthonsmartphone">';
print $form->select_dolusers($filterd, 'userdone', 1, '', ! $canedit);
print '</td></tr>';*/
include_once DOL_DOCUMENT_ROOT . '/core/class/html.formactions.class.php'; include_once DOL_DOCUMENT_ROOT . '/core/class/html.formactions.class.php';
$formactions=new FormActions($db); $formactions=new FormActions($db);

4
htdocs/core/lib/ajax.lib.php
View File

@ -321,8 +321,10 @@ function ajax_combobox($htmlname, $events=array(), $minLengthToAutocomplete=0)
global $conf; global $conf;
if (! empty($conf->browser->phone)) return ''; // combobox disabled for smartphones (does not works) if (! empty($conf->browser->phone)) return ''; // combobox disabled for smartphones (does not works)
if (! empty($conf->dol_use_jmobile)) return ''; // combobox with jmobile (does not works)
if (! empty($conf->global->MAIN_DISABLE_AJAX_COMBOX)) return ''; if (! empty($conf->global->MAIN_DISABLE_AJAX_COMBOX)) return '';
if (empty($conf->use_javascript_ajax)) return '';
/* Some properties for combobox: /* Some properties for combobox:
minLengthToAutocomplete: 2, minLengthToAutocomplete: 2,
comboboxContainerClass: "comboboxContainer", comboboxContainerClass: "comboboxContainer",

1
htdocs/langs/en_US/main.lang
View File

@ -169,6 +169,7 @@ User=User
Users=Users Users=Users
Group=Group Group=Group
Groups=Groups Groups=Groups
NoUserGroupDefined=No user group defined
Password=Password Password=Password
PasswordRetype=Retype your password PasswordRetype=Retype your password
NoteSomeFeaturesAreDisabled=Note that a lot of features/modules are disabled in this demonstration. NoteSomeFeaturesAreDisabled=Note that a lot of features/modules are disabled in this demonstration.