Fix tag integration (#1848)

pluginsGLPI · Jul 1, 2020 · 8f8ed93 · 8f8ed93
1 parent faa3f1f
commit 8f8ed93
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/inc/fields/dropdownfield.class.php b/inc/fields/dropdownfield.class.php
@@ -578,6 +578,11 @@ public function parseObjectProperties(
          $itemtype = $json->itemtype;
       }
 
+      // In some case, there is no itemtype (PluginFormcreatorTagField)
+      if (empty($itemtype)) {
+         return $content;
+      }
+
       $item = new $itemtype;
       $item->getFromDB($answer);
 

diff --git a/inc/fields/tagfield.class.php b/inc/fields/tagfield.class.php
@@ -70,6 +70,8 @@ public function displayField($canEdit = true) {
                   ['type_menu' => ['LIKE', '%\"Ticket\"%']],
                   ['type_menu' => ['LIKE', '%\"Change\"%']],
                   ['type_menu' => ['LIKE', '0']],
+                  ['type_menu' => ''],
+                  ['type_menu' => 'NULL'],
                ]
             ] + getEntitiesRestrictCriteria(PluginTagTag::getTable(), '', '', true),
             'ORDER'  => 'name'