Skip to content

Commit f336e1b

Browse files
authored
fix: set the default value of the dropdown as empty string (#3563)
* fix: set the default value of the dropdown as empty string * refactor
1 parent 72b6b54 commit f336e1b

1 file changed

Lines changed: 4 additions & 2 deletions

File tree

inc/field/fieldsfield.class.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -208,13 +208,15 @@ public function prepareHtmlField($fieldName, $canedit = true, $value = '') {
208208
$field['value'] = $value;
209209
} else {
210210
//get default value
211-
if ($this->getField()->fields['default_value'] !== "") {
211+
if (!empty($this->getField()->fields['default_value'])) {
212212
$value = $this->getField()->fields['default_value'];
213213
// shortcut for date/datetime
214214
if (in_array($this->getField()->fields['type'], ['date', 'datetime'])
215215
&& $value == 'now') {
216216
$value = $_SESSION["glpi_currenttime"];
217217
}
218+
} else {
219+
$value = '';
218220
}
219221
$field['value'] = $value;
220222
}
@@ -506,7 +508,7 @@ public function isValid(): bool {
506508
private function isAdditionalFieldEmpty(): bool {
507509
switch ($this->getField()->fields['type']) {
508510
case 'dropdown':
509-
return $this->getField()->fields['mandatory'] && $this->value == 0;
511+
return $this->getField()->fields['mandatory'] && empty($this->value);
510512
}
511513

512514
return $this->getField()->fields['mandatory'] && $this->value == '';

0 commit comments

Comments
 (0)