fix(selectfield): validity check different from radios field

Signed-off-by: Thierry Bugier <tbugier@teclib.com>
pluginsGLPI · Feb 23, 2021 · 46ce9b3 · 46ce9b3
1 parent 36870e5
commit 46ce9b3
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 14 deletions.
diff --git a/inc/field/selectfield.class.php b/inc/field/selectfield.class.php
@@ -34,6 +34,8 @@
 
 use Dropdown;
 use Html;
+use Session;
+use Toolbox;
 
 class SelectField extends RadiosField
 {
@@ -88,6 +90,30 @@ public static function getName(): string {
       return __('Select', 'formcreator');
    }
 
+   public function isValid(): bool {
+      // If the field is required it can't be empty
+      if ($this->isRequired() && $this->value == '0') {
+         Session::addMessageAfterRedirect(
+            sprintf(__('A required field is empty: %s', 'formcreator'), $this->getLabel()),
+            false,
+            ERROR
+         );
+         return false;
+      }
+
+      // All is OK
+      return $this->isValidValue($this->value);
+   }
+
+   public function isValidValue($value): bool {
+      if ($value == '0') {
+         return true;
+      }
+      $value = Toolbox::stripslashes_deep($value);
+      $value = trim($value);
+      return in_array($value, $this->getAvailableValues());
+   }
+
    public function equals($value): bool {
       if ($value == '') {
          // empty string means no selection

diff --git a/tests/3-unit/GlpiPlugin/Formcreator/Field/SelectField.php b/tests/3-unit/GlpiPlugin/Formcreator/Field/SelectField.php
@@ -141,8 +141,8 @@ public function providerIsValid() {
                   'order'           => '1',
                   'show_rule'       => \PluginFormcreatorCondition::SHOW_RULE_ALWAYS
             ],
-            'expectedValue'   => '1',
-            'expectedIsValid' => true
+            'value'   => '1',
+            'expected' => true
          ],
          [
             'fields'          => [
@@ -155,8 +155,8 @@ public function providerIsValid() {
                   'order'           => '1',
                   'show_rule'       => \PluginFormcreatorCondition::SHOW_RULE_ALWAYS
             ],
-            'expectedValue'   => '',
-            'expectedIsValid' => true
+            'value'   => '0',
+            'expected' => true
          ],
          [
             'fields'          => [
@@ -169,8 +169,8 @@ public function providerIsValid() {
                   'order'           => '1',
                   'show_rule'       => \PluginFormcreatorCondition::SHOW_RULE_ALWAYS
             ],
-            'expectedValue'   => '3',
-            'expectedIsValid' => true
+            'value'   => '3',
+            'expected' => true
          ],
          [
             'fields'          => [
@@ -183,8 +183,8 @@ public function providerIsValid() {
                   'order'           => '1',
                   'show_rule'       => \PluginFormcreatorCondition::SHOW_RULE_ALWAYS
             ],
-            'expectedValue'   => '1',
-            'expectedIsValid' => true
+            'value'   => '1',
+            'expected' => true
          ],
          [
             'fields'          => [
@@ -197,22 +197,22 @@ public function providerIsValid() {
                   'order'           => '1',
                   'show_rule'       => \PluginFormcreatorCondition::SHOW_RULE_ALWAYS
             ],
-            'expectedValue'   => '',
-            'expectedIsValid' => false
+            'value'   => '0',
+            'expected' => false
          ],
       ];
    }
 
    /**
     * @dataProvider providerIsValid
     */
-   public function testIsValid($fields, $expectedValue, $expected) {
+   public function testIsValid($fields, $value, $expected) {
       $question = $this->getQuestion($fields);
       $instance = $this->newTestedInstance($question);
-      $instance->deserializeValue($fields['default_values']);
+      $instance->deserializeValue($value);
 
-      $isValid = $instance->isValid();
-      $this->boolean((boolean) $isValid)->isEqualTo($expected);
+      $output = $instance->isValid();
+      $this->boolean((boolean) $output)->isEqualTo($expected);
    }
 
    public function testGetName() {