fix(targetticket,targetchange): specific tags not applicable

Signed-off-by: Thierry Bugier <tbugier@teclib.com>
pluginsGLPI · Jul 6, 2020 · 062d10e · 062d10e
1 parent 5963666
commit 062d10e
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/inc/targetbase.class.php b/inc/targetbase.class.php
@@ -1044,17 +1044,23 @@ function change_tag_type() {
          // Specific tags
          echo '<div id="tag_specific_value" style="display: none">';
 
+         $dbUtils = new DbUtils();
+         $entityRestrict = $dbUtils->getEntitiesRestrictCriteria(PluginTagTag::getTable(), "", "", true, false);
+         if (count($entityRestrict)) {
+            $entityRestrict = [$entityRestrict];
+         }
          $result = $DB->request([
             'SELECT' => ['id', 'name'],
             'FROM'   => PluginTagTag::getTable(),
             'WHERE'  => [
                'AND' => [
                   'OR' => [
                      ['type_menu' => ['LIKE', '%"' . $this->getTargetItemtypeName() . '"%']],
-                     ['type_menu' => ['LIKE', '%"0"%']]
+                     ['type_menu' => ['LIKE', '%"0"%']],
+                     ['type_menu' => ''],
+                     ['type_menu' => 'NULL'],
                   ],
-                  getEntitiesRestrictCriteria(PluginTagTag::getTable()),
-               ]
+               ] + $entityRestrict,
             ]
          ]);
          $values = [];