Merge branch 'release/2.9.2'

Author: cedric-anne

genericobject.xml

@@ -24,6 +24,11 @@
       <author>Walid Nouh</author>
    </authors>
    <versions>
+      <version>
+         <num>2.9.2</num>
+         <compatibility>~9.5.0</compatibility>
+         <download_url>https://github.com/pluginsGLPI/genericobject/releases/download/2.9.2/glpi-genericobject-2.9.2.tar.bz2</download_url>
+      </version>
       <version>
          <num>2.9.1</num>
          <compatibility>~9.5.0</compatibility>

inc/object.class.php

@@ -602,8 +602,8 @@ function displayField($canedit, $name, $value, $template, $description = []) {
          }
          $this->endColumn();
          $this->startColumn();
-         switch ($description['Type']) {
-            case "int(11)":
+         switch (preg_replace('/\(\d+\)$/', '', $description['Type'])) {
+            case "int":
                $fk_table = getTableNameForForeignKeyField($name);
                if ($fk_table != '') {
                   $itemtype   = getItemTypeForTable($fk_table);
@@ -653,11 +653,11 @@ function displayField($canedit, $name, $value, $template, $description = []) {
                }
                break;
 
-            case "tinyint(1)":
+            case "tinyint":
                Dropdown::showYesNo($name, $value);
                break;
 
-            case "varchar(255)":
+            case "varchar":
                if (isset($searchoption['autoname']) && $searchoption['autoname']) {
                   $objectName = autoName($this->fields[$name], $name, ($template === "newcomp"),
                                          $this->getType(), $this->fields["entities_id"]);

setup.php

@@ -35,7 +35,7 @@
  ----------------------------------------------------------------------
  */
 
-define ('PLUGIN_GENERICOBJECT_VERSION', '2.9.1');
+define ('PLUGIN_GENERICOBJECT_VERSION', '2.9.2');
 
 // Minimal GLPI version, inclusive
 define("PLUGIN_GENERICOBJECT_MIN_GLPI", "9.5");