fix(dropdownfield,glpiselectfield): empty value parameter not honored

Signed-off-by: Thierry Bugier <tbugier@teclib.com>
pluginsGLPI · Mar 20, 2020 · 187daa5 · 187daa5
1 parent 056b419
commit 187daa5
Showing 1 changed file with 3 additions and 18 deletions.
diff --git a/inc/fields/dropdownfield.class.php b/inc/fields/dropdownfield.class.php
@@ -153,7 +153,6 @@ public function getRenderedHtml($canEdit = true) {
       $id           = $this->question->getID();
       $rand         = mt_rand();
       $fieldName    = 'formcreator_field_' . $id;
-      $domId        = $fieldName . '_' . $rand;
       if (!empty($this->question->fields['values'])) {
          $dparams = ['name'     => $fieldName,
                      'value'    => $this->value,
@@ -265,6 +264,8 @@ public function getRenderedHtml($canEdit = true) {
 
          $dparams['condition'] = $dparams_cond_crit;
 
+         $dparams['display_emptychoice'] = ($this->question->fields['show_empty'] !== '0');
+
          $emptyItem = new $itemtype();
          $emptyItem->getEmpty();
          $dparams['displaywith'] = [];
@@ -274,23 +275,7 @@ public function getRenderedHtml($canEdit = true) {
          if (isset($emptyItem->fields['otherserial'])) {
             $dparams['displaywith'][] = 'otherserial';
          }
-         if (count($dparams['displaywith']) > 0) {
-            $dparams['itemtype'] = $itemtype;
-            $dparams['table'] = $itemtype::getTable();
-            $dparams['multiple'] = false;
-            $dparams['valuename'] = Dropdown::EMPTY_VALUE;
-            if ($dparams['value'] != 0) {
-               $dparams['valuename'] = $dparams['value'];
-            }
-            $html .= Html::jsAjaxDropdown(
-               $fieldName,
-               $domId,
-               $CFG_GLPI['root_doc']."/ajax/getDropdownFindNum.php",
-               $dparams
-            );
-         } else {
-            $html .= $itemtype::dropdown($dparams);
-         }
+         $itemtype::dropdown($dparams);
       }
       $html .= PHP_EOL;
       $html .= Html::scriptBlock("$(function() {