feat(urgencyfield): allow empty value

Signed-off-by: Thierry Bugier <[email protected]>
pluginsGLPI · Dec 30, 2020 · 0712662 · 0712662
1 parent 17cd956
commit 0712662
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 15 deletions.
diff --git a/inc/abstracttarget.class.php b/inc/abstracttarget.class.php
@@ -569,7 +569,7 @@ protected function setTargetUrgency($data, $formanswer) {
             $urgency = $this->fields['urgency_question'];
             break;
       }
-      if (!is_null($urgency)) {
+      if (!is_null($urgency) && $urgency != 0) {
          $data['urgency'] = $urgency;
       }
 

diff --git a/inc/field/urgencyfield.class.php b/inc/field/urgencyfield.class.php
@@ -57,11 +57,12 @@ public function getDesignSpecializationField(): array {
       $additions .= '</td>';
       $additions .= '<td>';
       $additions .= Ticket::dropdownUrgency([
-         'name'     => 'default_values',
-         'value'    => $this->question->fields['default_values'],
-         'comments' => false,
-         'rand'     => $rand,
-         'display'  => false,
+         'name'                => 'default_values',
+         'value'               => $this->question->fields['default_values'],
+         'comments'            => false,
+         'rand'                => $rand,
+         'display'             => false,
+         'display_emptychoice' => true,
       ]);
       $additions .= '</td>';
       $additions .= '<td>';
@@ -74,10 +75,10 @@ public function getDesignSpecializationField(): array {
       $additions .= $common['additions'];
 
       return [
-         'label' => $label,
-         'field' => $field,
-         'additions' => $additions,
-         'may_be_empty' => false,
+         'label'           => $label,
+         'field'           => $field,
+         'additions'       => $additions,
+         'may_be_empty'    => true,
          'may_be_required' => true,
       ];
    }
@@ -92,11 +93,12 @@ public function getRenderedHtml($canEdit = true): string {
       $rand         = mt_rand();
       $fieldName    = 'formcreator_field_' . $id;
       $html .= Ticket::dropdownUrgency([
-         'name'     => $fieldName,
-         'value'    => $this->value,
-         'comments' => false,
-         'rand'     => $rand,
-         'display'  => false,
+         'name'                => $fieldName,
+         'value'               => $this->value,
+         'comments'            => false,
+         'rand'                => $rand,
+         'display'             => false,
+         'display_emptychoice' => true,
       ]);
       $html .= PHP_EOL;
       $html .= Html::scriptBlock("$(function() {