Fix group dropdown in escalate form (#163)

pluginsGLPI · Feb 21, 2024 · ac57edc · ac57edc
1 parent 42b77df
commit ac57edc
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/inc/ticket.class.php b/inc/ticket.class.php
@@ -918,19 +918,22 @@ public function showForm($ID, $options = [])
         foreach ($groups as $grp) {
             $assigned_groups[$grp['groups_id']] = $grp['groups_id'];
         }
-
+        $config = new PluginEscaladeConfig();
+        $config->getFromDB(1);
         $PluginEscaladeGroup_Group = new PluginEscaladeGroup_Group();
         $groups_id_filtered = array_keys($PluginEscaladeGroup_Group->getGroups($tickets_id));
         $groups_id_filtered = empty($groups_id_filtered) ? [-1] : $groups_id_filtered;
-
+        $condition = [
+            'is_assign' => 1
+        ];
+        if ($config->fields['use_filter_assign_group']) {
+            $condition['id'] = $groups_id_filtered;
+        }
         TemplateRenderer::getInstance()->display('@escalade/escalade_form.html.twig', [
             'action'          => PLUGIN_ESCALADE_WEBDIR . '/front/ticket.form.php',
             'ticket'          => $options['parent'],
             'assigned_groups' => $assigned_groups,
-            'condidition'     => [
-                'is_assign' => 1,
-                'id' => $groups_id_filtered,
-            ],
+            'condition'     => $condition,
         ]);
     }
 }
diff --git a/templates/escalade_form.html.twig b/templates/escalade_form.html.twig
@@ -72,7 +72,7 @@
                             'required' : true,
                             'icon_label': true,
                             'entity': ticket.fields['entities_id'],
-                            'condition': condidition,
+                            'condition': condition,
                             'value' : 0,
                             'used': assigned_groups,
                             'rand': rand,