Fix dynamic groups actors

closes #770

Revert "Fix tu deploy (#724)"
This reverts commit 938c71a.

Author: trasher

CHANGELOG.md

@@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [1.6.1] - unreleased
 
+- Fix visibility issue on deploy dynamic groups with GLPI v11.0.2
 - Fix deploy ajax action path
 - Prevent fatal errors when ini_set is not allowed
 

hook.php

@@ -1,6 +1,5 @@
 <?php
 
-use Glpi\DBAL\QueryExpression;
 use Glpi\Error\ErrorHandler;
 use Safe\Exceptions\InfoException;
 
@@ -38,39 +37,6 @@
  * ---------------------------------------------------------------------
  */
 
-function plugin_glpiinventory_add_default_where($in)
-{
-    [$itemtype, $condition] = $in;
-
-    if ($itemtype === Computer::class && str_contains($_SERVER['REQUEST_URI'] ?? '', 'deploypackage.public.php')) {
-        // Specific case related to Self-Service profile rights:
-        // - As Computer object has no read permission for Self-Service profile,
-        //   Computer::getAssignableVisiblityCriteria() returns a QueryExpression("0").
-        // - This leads to a "WHERE (0)" clause in the SQL query, which discards
-        //   all results (e.g. no deployment packages shown in Self-Service).
-        // - To fix this in the plugin, we explicitly filter out QueryExpression
-        //   instances with value "0", while keeping all other valid criteria
-        //   generated by GLPI.
-        removeEmptyCondition($condition);
-    }
-
-    return [$itemtype, $condition];
-}
-
-function removeEmptyCondition(array &$conditions): void
-{
-    foreach ($conditions as $key => $condition) {
-        if (is_array($condition)) {
-            removeEmptyCondition($condition);
-            if (empty($condition)) {
-                unset($conditions[$key]);
-            }
-        } elseif ($condition instanceof QueryExpression && $condition->getValue() == 0) {
-            unset($conditions[$key]);
-        }
-    }
-}
-
 /**
  * Add search options for GLPI objects
  *

setup.php

@@ -375,8 +375,6 @@ function plugin_init_glpiinventory()
     $PLUGIN_HOOKS[Hooks::HANDLE_ESX_TASK]['glpiinventory'] = 'plugin_glpiinventory_handle_esx_task';
     $PLUGIN_HOOKS[Hooks::HANDLE_COLLECT_TASK]['glpiinventory'] = 'plugin_glpiinventory_handle_collect_task';
     $PLUGIN_HOOKS[Hooks::HANDLE_DEPLOY_TASK]['glpiinventory'] = 'plugin_glpiinventory_handle_deploy_task';
-
-    $PLUGIN_HOOKS[Hooks::ADD_DEFAULT_WHERE]['glpiinventory'] = 'plugin_glpiinventory_add_default_where';
 }
 
 

tests/Integration/Deploy/PackageSelfDeployTest.php

@@ -409,6 +409,10 @@ public function testReportMyPackage()
         // Prepare task
         PluginGlpiinventoryTask::cronTaskscheduler();
 
+        $reference = [
+            'agents_prepared',
+        ];
+
         $_SERVER['REQUEST_URI'] = 'front/deploypackage.php'; // URL is used to fix addDefaultWhere
         $packages = $pfDeployPackage->getPackageForMe($userId);
         $packages_deploy = [];
@@ -419,7 +423,7 @@ public function testReportMyPackage()
                 }
             }
         }
-        $this->assertEquals([], $packages_deploy);
+        $this->assertEquals($reference, $packages_deploy);
 
         $_SERVER['REQUEST_URI'] = 'front/deploypackage.public.php'; // URL is used to fix addDefaultWhere
         $packages = $pfDeployPackage->getPackageForMe($userId);
@@ -431,9 +435,6 @@ public function testReportMyPackage()
                 }
             }
         }
-        $reference = [
-            'agents_prepared',
-        ];
         $this->assertEquals($reference, $packages_deploy);
     }