fix(Massive actions) rights uniformisation for twig and massive actio…

…ns to add tasks and followups
glpi-project · Feb 9, 2023 · 2519e73 · 2519e73
1 parent 635e949
commit 2519e73
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/CommonITILObject.php b/src/CommonITILObject.php
@@ -3699,7 +3699,7 @@ public static function processMassiveActionsForOneItemtype(
                             'state'             => $input['state'],
                             'content'           => $input['content']
                         ];
-                        if ($task->can(-1, CREATE, $input2)) {
+                        if ($task->can(-1, CREATE, $input2) && !in_array($item->fields['status'], array_merge($item->getSolvedStatusArray(), $item->getClosedStatusArray()))) {
                             if ($task->add($input2)) {
                                 $ma->itemDone($item->getType(), $id, MassiveAction::ACTION_OK);
                             } else {

diff --git a/src/ITILFollowup.php b/src/ITILFollowup.php
@@ -840,7 +840,7 @@ public static function processMassiveActionsForOneItemtype(
                 $fup   = new self();
                 foreach ($ids as $id) {
                     if ($item->getFromDB($id)) {
-                        if (in_array($item->fields['status'], $item->getClosedStatusArray())) {
+                        if (in_array($item->fields['status'], array_merge($item->getSolvedStatusArray(), $item->getClosedStatusArray()))) {
                             $ma->itemDone($item->getType(), $id, MassiveAction::ACTION_KO);
                             $ma->addMessage($item->getErrorMessage(ERROR_RIGHT));
                         } else {