Add missing inputs for rules using ticket validation criteria

glpi-project · Dec 19, 2024 · d96ffdf · d96ffdf
1 parent ec80b07
commit d96ffdf
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/src/CommonITILValidation.php b/src/CommonITILValidation.php
@@ -453,6 +453,7 @@ public function post_updateItem($history = true)
                     'id'                    => $this->fields[static::$items_id],
                     'global_validation'     => self::computeValidationStatus($item),
                     '_from_itilvalidation'  => true,
+                    'itemtype'              => static::$itemtype
                 ];
                 $item->update($input);
             }

diff --git a/src/Rule.php b/src/Rule.php
@@ -1716,7 +1716,13 @@ public function checkCriteria($criteria, &$input)
         $partial_regex_result = [];
        // Undefine criteria field : set to blank
         if (!isset($input[$criteria->fields["criteria"]])) {
-            $input[$criteria->fields["criteria"]] = '';
+            if (isset($input['itemtype'])) {
+                $itemtype = new $input['itemtype']();
+                $item = $itemtype->getById($input['id']);
+                $input[$criteria->fields["criteria"]] = $item->fields[$criteria->fields["criteria"]];
+            } else {
+                $input[$criteria->fields["criteria"]] = '';
+            }
         }
 
        //If the value is not an array