Fix impossibility to use regex result in comments

glpi-project · Oct 7, 2024 · 7480d69 · 7480d69
1 parent fc4894a
commit 7480d69
Show file tree

Hide file tree

Showing 2 changed files with 80 additions and 0 deletions.
diff --git a/phpunit/functional/RuleAssetTest.php b/phpunit/functional/RuleAssetTest.php
@@ -203,6 +203,47 @@ public function testTriggerUpdate()
         }
     }
 
+    public function testTriggerUpdateCommentRegex()
+    {
+        global $CFG_GLPI;
+
+        $this->login();
+        $this->setEntity('_test_root_entity', true);
+
+        $root_ent_id = getItemByTypeName('Entity', '_test_root_entity', true);
+
+        // prepare rule
+        $this->createRuleCommentRegex(\RuleAsset::ONUPDATE);
+        $this->createRuleLocation(\RuleAsset::ONUPDATE);
+
+        foreach ($CFG_GLPI['asset_types'] as $itemtype) {
+            $item     = new $itemtype();
+            $item_input = [
+                'name'        => "$itemtype 3",
+                'entities_id' => $root_ent_id,
+                'is_dynamic'  => 1,
+                'comment'     => 'mycomment'
+            ];
+            if ($itemtype == 'SoftwareLicense') {
+                $item_input['softwares_id'] = 1;
+            }
+            $items_id = $item->add($item_input);
+            $this->assertGreaterThan(0, (int)$items_id);
+
+            // Trigger update
+            $update = $item->update([
+                'id'    => $item->getID(),
+                'name'  => 'updated name',
+                '_auto' => 1,
+            ]);
+            $this->assertTrue($update);
+
+            $this->assertTrue((bool)$item->getFromDB($items_id));
+            $this->assertEquals($itemtype . 'test', (string)$item->getField('comment'));
+            $this->assertGreaterThan(0, (int)$item->getField('locations_id'));
+        }
+    }
+
     private function createRuleComment($condition)
     {
         $ruleasset  = new \RuleAsset();
@@ -241,6 +282,44 @@ private function createRuleComment($condition)
         $this->checkInput($ruleaction, $act_id, $act_input);
     }
 
+    private function createRuleCommentRegex($condition)
+    {
+        $ruleasset  = new \RuleAsset();
+        $rulecrit   = new \RuleCriteria();
+        $ruleaction = new \RuleAction();
+
+        $ruleid = $ruleasset->add($ruleinput = [
+            'name'         => "rule comment regex",
+            'match'        => 'AND',
+            'is_active'    => 1,
+            'sub_type'     => 'RuleAsset',
+            'condition'    => $condition,
+            'is_recursive' => 1
+        ]);
+        $this->checkInput($ruleasset, $ruleid, $ruleinput);
+        $crit_id = $rulecrit->add($crit_input = [
+            'rules_id'  => $ruleid,
+            'criteria'  => '_itemtype',
+            'condition' => \Rule::REGEX_MATCH,
+            'pattern'   => "/(.*)/s"
+        ]);
+        $this->checkInput($rulecrit, $crit_id, $crit_input);
+        $crit_id = $rulecrit->add($crit_input = [
+            'rules_id'  => $ruleid,
+            'criteria'  => '_auto',
+            'condition' => \Rule::PATTERN_IS,
+            'pattern'   => 1
+        ]);
+        $this->checkInput($rulecrit, $crit_id, $crit_input);
+        $act_id = $ruleaction->add($act_input = [
+            'rules_id'    => $ruleid,
+            'action_type' => 'regex_result',
+            'field'       => 'comment',
+            'value'       => '#0test'
+        ]);
+        $this->checkInput($ruleaction, $act_id, $act_input);
+    }
+
     private function createRuleLocation($condition)
     {
         $ruleasset  = new \RuleAsset();

diff --git a/src/RuleAsset.php b/src/RuleAsset.php
@@ -195,6 +195,7 @@ public function getActions()
         $actions['comment']['table']            = '';
         $actions['comment']['field']            = 'comment';
         $actions['comment']['name']             = __('Comments');
+        $actions['comment']['force_actions']    = ['assign', 'regex_result'];
 
         $actions['otherserial']['name']              = __('Inventory number');
         $actions['otherserial']['type']              = 'text';