There is no "attr" for simple inputs

Add test on type != text
glpi-project · Dec 14, 2017 · efded92 · efded92
1 parent d7dc61c
commit efded92
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/inc/commondropdown.class.php b/inc/commondropdown.class.php
@@ -344,9 +344,8 @@ function showForm($ID, $options = []) {
                } else {
                   echo Html::input(
                      $field['name'], [
-                     'attrs' => [
                         'type'   => 'number'
-                     ] + $params]
+                     ] + $params
                   );
                }
                break;

diff --git a/inc/html.class.php b/inc/html.class.php
@@ -4521,9 +4521,9 @@ static function hidden($fieldName, $options = []) {
    **/
    static function input($fieldName, $options = []) {
       $type = 'text';
-      if (isset($options['attrs']) && isset($options['attrs']['type'])) {
-         $type = $options['attrs']['type'];
-         unset($options['attrs']['type']);
+      if (isset($options['type'])) {
+         $type = $options['type'];
+         unset($options['type']);
       }
       return sprintf('<input type="%1$s" name="%2$s" %3$s />',
                      $type, Html::cleanInputText($fieldName), Html::parseAttributes($options));

diff --git a/tests/units/Html.php b/tests/units/Html.php
@@ -880,5 +880,14 @@ public function testInput() {
       ];
       $expected = '<input type="text" name="in_put" value="myval" class="a_class" data-id="12" />';
       $this->string(\Html::input($name, $options))->isIdenticalTo($expected);
+
+      $options = [
+         'type'      => 'number',
+         'min'       => '10',
+         'value'     => 'myval',
+      ];
+      $expected = '<input type="number" name="in_put" min="10" value="myval" />';
+      $this->string(\Html::input($name, $options))->isIdenticalTo($expected);
+
    }
 }