No longer rely on state registered types to list rules

closes glpi-project#18485
cconard96 · Dec 9, 2024 · 846fd74 · 846fd74
1 parent 103a18c
commit 846fd74
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 5 deletions.
diff --git a/src/Glpi/Asset/Capacity/IsInventoriableCapacity.php b/src/Glpi/Asset/Capacity/IsInventoriableCapacity.php
@@ -95,6 +95,7 @@ public function onClassBootstrap(string $classname): void
         $this->registerToTypeConfig('agent_types', $classname);
         $this->registerToTypeConfig('environment_types', $classname);
         $this->registerToTypeConfig('process_types', $classname);
+        $this->registerToTypeConfig('ruleimportasset_types', $classname);
 
         //copy rules from "inventory model" (Computer only for now)
 
@@ -117,6 +118,7 @@ public function onCapacityDisabled(string $classname): void
         $this->unregisterFromTypeConfig('agent_types', $classname);
         $this->unregisterFromTypeConfig('environment_types', $classname);
         $this->unregisterFromTypeConfig('process_types', $classname);
+        $this->unregisterFromTypeConfig('ruleimportasset_types', $classname);
 
         $env_item = new Item_Environment();
         $env_item->deleteByCriteria([

diff --git a/src/Glpi/Search/SearchEngine.php b/src/Glpi/Search/SearchEngine.php
@@ -173,7 +173,7 @@ public static function getMetaItemtypeAvailable($itemtype): array
     private static function getMetaParentItemtypesForTypesConfig(string $config_key): array
     {
         $matches = [];
-        if (preg_match('/^(.+)_types$/', $config_key, $matches) === 0) {
+        if (str_contains($config_key, 'rule') || preg_match('/^(.+)_types$/', $config_key, $matches) === 0) {
             return [];
         }
 

diff --git a/src/Rule.php b/src/Rule.php
@@ -2468,7 +2468,7 @@ public function displayCriteriaSelectPattern($name, $ID, $condition, $value = ""
                     break;
 
                 case "dropdown_inventory_itemtype":
-                    $types = $CFG_GLPI['state_types'];
+                    $types = $CFG_GLPI['ruleimportasset_types'];
                     $types[''] = __('No item type defined');
                     Dropdown::showItemTypes($name, $types, ['value' => $value]);
                     $display = true;

diff --git a/src/RuleImportAsset.php b/src/RuleImportAsset.php
@@ -1057,7 +1057,7 @@ public function showSpecificCriteriasForPreview($fields)
     }
 
     /**
-     * Get itemtypes have state_type and unmanaged devices
+     * Get itemtypes
      *
      * @global array $CFG_GLPI
      * @return array
@@ -1068,7 +1068,7 @@ public static function getItemTypesForRules()
         global $CFG_GLPI;
 
         $types = [];
-        foreach ($CFG_GLPI["state_types"] as $itemtype) {
+        foreach ($CFG_GLPI["ruleimportasset_types"] as $itemtype) {
             if (class_exists($itemtype)) {
                 $item = new $itemtype();
                 $types[$itemtype] = $item->getTypeName();

diff --git a/src/RuleImportAssetCollection.php b/src/RuleImportAssetCollection.php
@@ -62,7 +62,7 @@ public function getTabNameForItem(CommonGLPI $item, $withtemplate = 0)
             switch ($item::class) {
                 case self::class:
                     $ong    = [];
-                    $types = $CFG_GLPI['state_types'];
+                    $types = $CFG_GLPI['ruleimportasset_types'];
                     foreach ($types as $type) {
                         if (class_exists($type)) {
                             $ong[$type] = $type::getTypeName();

diff --git a/src/autoload/CFG_GLPI.php b/src/autoload/CFG_GLPI.php
@@ -130,6 +130,14 @@
     'Appliance', 'DatabaseInstance', 'Cable', 'Unmanaged', 'PassiveDCEquipment'
 ];
 
+$CFG_GLPI["ruleimportasset_types"]                  = ['Computer', 'Monitor', 'NetworkEquipment',
+    'Peripheral', 'Phone', 'Printer', 'SoftwareLicense',
+    'Certificate', 'Enclosure', 'PDU', 'Line',
+    'Rack', 'SoftwareVersion', 'Cluster', 'Contract',
+    'Appliance', 'DatabaseInstance', 'Cable', 'Unmanaged', 'PassiveDCEquipment'
+];
+
+
 $CFG_GLPI["asset_types"]                  = ['Computer', 'Monitor', 'NetworkEquipment',
     'Peripheral', 'Phone', 'Printer', 'SoftwareLicense',
     'Certificate', 'Unmanaged', 'Appliance'