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

FIX stickler

Browse Source
This commit is contained in:
Quentin VIAL-GOUTEYRON 2022-01-05 15:33:05 +01:00
parent 7a4b0e38cd
commit 446ba2a416
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1690,17 +1690,18 @@ class Form
$out .= '<select class="flat'.($moreclass ? ' '.$moreclass : '').'" id="'.$htmlid.'" name="'.$htmlname.(($num || empty($disableifempty)) ? '' : ' disabled').($multiple ? '[]' : '').'" '.($multiple ? 'multiple' : '').' '.(!empty($moreparam) ? $moreparam : '').'>'; $out .= '<select class="flat'.($moreclass ? ' '.$moreclass : '').'" id="'.$htmlid.'" name="'.$htmlname.(($num || empty($disableifempty)) ? '' : ' disabled').($multiple ? '[]' : '').'" '.($multiple ? 'multiple' : '').' '.(!empty($moreparam) ? $moreparam : '').'>';
} }
if($showempty && !is_numeric($showempty)) { if ($showempty && ! is_numeric($showempty)) {
$textforempty = $showempty; $textforempty = $showempty;
$out .= '<option class="optiongrey" value="-1"'.(in_array(-1, $selected) ? ' selected' : '').'>'.$textforempty.'</option>'; $out .= '<option class="optiongrey" value="-1"'.(in_array(-1, $selected) ? ' selected' : '').'>'.$textforempty.'</option>';
} else { }
if(($showempty == 1 || ($showempty == 3 && $num > 1)) && ! $multiple) { else {
$out .= '<option value="0"'.(in_array(0, $selected) ? ' selected' : '').'>&nbsp;</option>'; if (($showempty == 1 || ($showempty == 3 && $num > 1)) && ! $multiple) {
} $out .= '<option value="0"'.(in_array(0, $selected) ? ' selected' : '').'>&nbsp;</option>';
if($showempty == 2) { }
$out .= '<option value="0"'.(in_array(0, $selected) ? ' selected' : '').'>-- '.$langs->trans("Internal").' --</option>'; if ($showempty == 2) {
} $out .= '<option value="0"'.(in_array(0, $selected) ? ' selected' : '').'>-- '.$langs->trans("Internal").' --</option>';
} }
}
$i = 0; $i = 0;
if ($num) { if ($num) {

2
htdocs/projet/list.php
View File

@ -371,7 +371,7 @@ $sql .= " WHERE ctc.element = '".$db->escape($object->element)."'";
$resql = $db->query($sql); $resql = $db->query($sql);
if ($resql) { if ($resql) {
while ($obj = $db->fetch_object($resql)) { while ($obj = $db->fetch_object($resql)) {
if($obj->source == 'internal') $listofprojectcontacttype[$obj->rowid] = $obj->code; if ($obj->source == 'internal') $listofprojectcontacttype[$obj->rowid] = $obj->code;
else $listofprojectcontacttypeexternal[$obj->rowid] = $obj->code; else $listofprojectcontacttypeexternal[$obj->rowid] = $obj->code;
} }
} else { } else {