distinguish single massive actions

cconard96 · Dec 7, 2024 · df2fbeb · df2fbeb
1 parent 103a18c
commit df2fbeb
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 3 deletions.
diff --git a/src/MassiveAction.php b/src/MassiveAction.php
@@ -173,6 +173,8 @@ class MassiveAction
      */
     private $current_itemtype;
 
+    private $from_single_item = false;
+
     /**
      * Constructor of massive actions.
      * There is three stages and each one have its own objectives:
@@ -192,6 +194,8 @@ public function __construct(array $POST, array $GET, $stage, ?int $items_id = nu
         /** @var array $CFG_GLPI */
         global $CFG_GLPI;
 
+        $this->from_single_item = $GET['_from_single_item'] ?? false;
+
         if (!empty($POST)) {
             if (!isset($POST['is_deleted'])) {
                 $POST['is_deleted'] = 0;
@@ -1923,4 +1927,12 @@ public function itemDone($itemtype, $id, $result)
 
         $this->updateProgressBars();
     }
+
+    /**
+     * @return bool True if massive actions are running from a single item context such as the item's form.
+     */
+    public function isFromSingleItem(): bool
+    {
+        return $this->from_single_item;
+    }
 }
diff --git a/src/Unmanaged.php b/src/Unmanaged.php
@@ -323,7 +323,7 @@ public static function processMassiveActionsForOneItemtype(
                     $itemtype = $_POST['itemtype'];
                     $new_asset_id = $unmanaged->convert($id, $itemtype);
                     $ma->itemDone($item->getType(), $id, MassiveAction::ACTION_OK);
-                    if (count($ids) === 1) {
+                    if ($ma->isFromSingleItem()) {
                         $ma->setRedirect($itemtype::getFormURLWithID($new_asset_id));
                     } else {
                         $ma->setRedirect($item::getSearchURL());

diff --git a/templates/components/form/header_content.html.twig b/templates/components/form/header_content.html.twig
@@ -65,7 +65,7 @@
 
 {% if item.canEdit(item.fields['id']) %}
    <form name="massaction_{{ rand }}" id="massaction_{{ rand }}" method="post"
-         action="{{ path('/front/massiveaction.php') }}" data-submit-once>
+         action="{{ path('/front/massiveaction.php') }}?_from_single_item=1" data-submit-once>
       <div id="massive_container_{{ rand }}"></div>
       <input type="hidden" name="_glpi_csrf_token" value="{{ csrf_token() }}" />
    </form>

diff --git a/templates/components/itilobject/layout.html.twig b/templates/components/itilobject/layout.html.twig
@@ -109,7 +109,7 @@
 {% endfor %}
 
 <form name="massaction_{{ rand }}" id="massaction_{{ rand }}" method="post"
-      action="{{ path('/front/massiveaction.php') }}" data-submit-once>
+      action="{{ path('/front/massiveaction.php') }}?_from_single_item=1" data-submit-once>
    <div id="massive_container_{{ rand }}"></div>
    <input type="hidden" name="_glpi_csrf_token" value="{{ csrf_token() }}" />
 </form>