Merge remote-tracking branch 'origin/support/2.13.0' into support/2.14.0

pluginsGLPI · Feb 19, 2024 · 5490986 · 5490986
2 parents 9c5a2c2 + eebcc21
commit 5490986
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/inc/field/dropdownfield.class.php b/inc/field/dropdownfield.class.php
@@ -754,8 +754,9 @@ private function getMyGroups($userID) {
       if ($result->count() === 0) {
          return [];
       }
+      $a_groups = [];
       foreach ($result as $data) {
-         $a_groups                     = $dbUtil->getAncestorsOf("glpi_groups", $data["groups_id"]);
+         $a_groups                     = $a_groups + $dbUtil->getAncestorsOf("glpi_groups", $data["groups_id"]);
          $a_groups[$data["groups_id"]] = $data["groups_id"];
       }
       return $a_groups;

diff --git a/inc/issue.class.php b/inc/issue.class.php
@@ -751,6 +751,7 @@ public function rawSearchOptions() {
          'field'              => 'name',
          'name'               => __('Technician'),
          'datatype'           => 'dropdown',
+         'forcegroupby'       => true,
          'massiveaction'      => false,
          'nodisplay'          => $hide_technician,
          'nosearch'           => $hide_technician,