Fixed the objects creation with rolf tags and saving of the current c…

…ontroll on the op risks table.
monarc-project · Sep 27, 2024 · 16ad8ae · 16ad8ae
1 parent 7a0940e
commit 16ad8ae
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/src/Service/ObjectService.php b/src/Service/ObjectService.php
@@ -209,7 +209,7 @@ public function create(array $data, bool $saveInDb = true): Entity\MonarcObject
         if (!empty($data['category'])) {
             $this->validateAndSetCategory($monarcObject, $data);
         }
-        if (!empty($data['rolfTag']) && !$asset->isPrimary()) {
+        if (!empty($data['rolfTag']) && $asset->isPrimary()) {
             /** @var Entity\RolfTag $rolfTag */
             $rolfTag = $this->rolfTagTable->findById((int)$data['rolfTag']);
             $monarcObject->setRolfTag($rolfTag);

diff --git a/src/Validator/InputValidator/InstanceRiskOp/UpdateInstanceRiskOpDataInputValidator.php b/src/Validator/InputValidator/InstanceRiskOp/UpdateInstanceRiskOpDataInputValidator.php
@@ -7,6 +7,7 @@
 
 namespace Monarc\Core\Validator\InputValidator\InstanceRiskOp;
 
+use Laminas\Filter\StringTrim;
 use Laminas\Filter\ToInt;
 use Laminas\Validator\InArray;
 use Monarc\Core\Entity\InstanceRiskOpSuperClass;
@@ -17,6 +18,16 @@ class UpdateInstanceRiskOpDataInputValidator extends AbstractInputValidator
     protected function getRules(): array
     {
         return [
+            [
+                'name' => 'comment',
+                'required' => false,
+                'filters' => [
+                    [
+                        'name' => StringTrim::class,
+                    ],
+                ],
+                'validators' => [],
+            ],
             [
                 'name' => 'netProb',
                 'required' => false,