fix(dropdownfield): group restriction inaccurate

btry · btry · commit ab83f34d9f18 · 2021-10-29T10:48:46.000+02:00
Signed-off-by: Thierry Bugier &lt;tbugier@teclib.com&gt;
diff --git a/inc/field/dropdownfield.class.php b/inc/field/dropdownfield.class.php
@@ -614,14 +614,13 @@ private function getMyGroups($userID) {
             $_SESSION['glpiactive_entity_recursive']
          )
       ]);
-      if ($result->count() === 0) {
-         return [];
-      }
+      $groups  = [];
       foreach ($result as $data) {
          $a_groups                     = $dbUtil->getAncestorsOf("glpi_groups", $data["groups_id"]);
          $a_groups[$data["groups_id"]] = $data["groups_id"];
+         $groups = array_merge($groups, $a_groups);
       }
-      return $a_groups;
+      return $groups;
    }
 
    public function equals($value): bool {

Original file line number	Diff line number	Diff line change
`@@ -614,14 +614,13 @@ private function getMyGroups($userID) {`
`614`	`614`	`$_SESSION['glpiactive_entity_recursive']`
`615`	`615`	`)`
`616`	`616`	`]);`
`617`		`- if ($result->count() === 0) {`
`618`		`- return [];`
`619`		`- }`
	`617`	`+ $groups = [];`
`620`	`618`	`foreach ($result as $data) {`
`621`	`619`	`$a_groups = $dbUtil->getAncestorsOf("glpi_groups", $data["groups_id"]);`
`622`	`620`	`$a_groups[$data["groups_id"]] = $data["groups_id"];`
	`621`	`+ $groups = array_merge($groups, $a_groups);`
`623`	`622`	`}`
`624`		`- return $a_groups;`
	`623`	`+ return $groups;`
`625`	`624`	`}`
`626`	`625`
`627`	`626`	`public function equals($value): bool {`