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

Fixed: bad conditions

Browse Source
This commit is contained in:
Laurent Destailleur 2014-12-20 11:34:37 +01:00
parent 854ed90a62
commit c9f3267649
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1343,7 +1343,7 @@ class Form
} }
$out.= '</select>'; $out.= '</select>';
if (! empty($conf->use_javascript_ajax)) if (! empty($conf->use_javascript_ajax) && ! $show_empty) // ajaxcombo works only on list with no empty value because of &nbsp;
{ {
include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php'; include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
$out.= ajax_combobox($htmlname); $out.= ajax_combobox($htmlname);
@ -4573,12 +4573,12 @@ class Form
else else
{ {
$out.= '<select class="flat" name="'.$htmlname.'"'.($show_empty?'':' disabled="disabled"').'>'; $out.= '<select class="flat" name="'.$htmlname.'"'.($show_empty?'':' disabled="disabled"').'>';
if ($show_empty) $out.= '<option value="-1"'.($selected==-1?' selected="selected"':'').'>&nbsp;</option>'."\n"; if ($show_empty) $out.= '<option value="-1"'.($selected==-1?' selected="selected"':'').'></option>'."\n";
$out.= '<option value="" disabled="disabled">'.$langs->trans("NoUserGroupDefined").'</option>'; $out.= '<option value="" disabled="disabled">'.$langs->trans("NoUserGroupDefined").'</option>';
} }
$out.= '</select>'; $out.= '</select>';
if (! empty($conf->use_javascript_ajax)) if (! empty($conf->use_javascript_ajax) && ! $show_empty) // ajax combo works only when no empty value
{ {
include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php'; include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
$out.= ajax_combobox($htmlname); $out.= ajax_combobox($htmlname);

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

@ -124,16 +124,18 @@ function print_actions_filter($form, $canedit, $status, $year, $month, $day, $sh
print '<tr>'; print '<tr>';
print '<td class="nowrap">'.$langs->trans("WorkingTimeRange").'</td>'; print '<td class="nowrap">'.$langs->trans("WorkingTimeRange").'</td>';
print "<td class='nowrap maxwidthonsmartphone'>"; print "<td class='nowrap maxwidthonsmartphone'>";
print '<input type="number" class="short" name="begin_h" value="'.$begin_h.'" min="0" max="23"> - '; print '<input type="number" class="short" name="begin_h" value="'.$begin_h.'" min="0" max="23">';
if (empty($conf->dol_use_jmobile)) print ' - ';
print '<input type="number" class="short" name="end_h" value="'.$end_h.'" min="1" max="24">'; print '<input type="number" class="short" name="end_h" value="'.$end_h.'" min="1" max="24">';
print ' '.$langs->trans("H"); if (empty($conf->dol_use_jmobile)) print ' '.$langs->trans("H");
print '</td></tr>'; print '</td></tr>';
// Filter on days // Filter on days
print '<tr>'; print '<tr>';
print '<td class="nowrap">'.$langs->trans("WorkingDaysRange").'</td>'; print '<td class="nowrap">'.$langs->trans("WorkingDaysRange").'</td>';
print "<td class='nowrap maxwidthonsmartphone'>"; print "<td class='nowrap maxwidthonsmartphone'>";
print '<input type="number" class="short" name="begin_d" value="'.$begin_d.'" min="1" max="7"> - '; print '<input type="number" class="short" name="begin_d" value="'.$begin_d.'" min="1" max="7">';
if (empty($conf->dol_use_jmobile)) print ' - ';
print '<input type="number" class="short" name="end_d" value="'.$end_d.'" min="1" max="7">'; print '<input type="number" class="short" name="end_d" value="'.$end_d.'" min="1" max="7">';
print '</td></tr>'; print '</td></tr>';
} }