Merge branch 'release/2.1.2'

pluginsGLPI · Sep 10, 2018 · 15c14b3 · 15c14b3
2 parents 22aa33e + 40d9048
commit 15c14b3
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 6 deletions.
diff --git a/ajax/group_values.php b/ajax/group_values.php
@@ -30,5 +30,5 @@
    $_SESSION['glpicondition'][$rand]  = getEntitiesRestrictRequest(" ", "", "entities_id",
                                                        $_SESSION['glpiactive_entity'], 1). "AND glpi_groups.is_assign";
 }
-$_POST = $default_options; // fix for glpi 9.1
+$_POST += $default_options; // fix for glpi 9.1
 require ("../../../ajax/getDropdownValue.php");
diff --git a/itilcategorygroups.xml b/itilcategorygroups.xml
@@ -37,6 +37,10 @@ Potom, pro každou z kategorií požadavku je možné určit která skupina bude
       <author>François Legastelois</author>
    </authors>
    <versions>
+      <version>
+         <num>2.1.2</num>
+         <compatibility>9.3</compatibility>
+      </version>
       <version>
          <num>2.1.1</num>
          <compatibility>9.3</compatibility>

diff --git a/scripts/filtergroups.js.php b/scripts/filtergroups.js.php
@@ -58,19 +58,22 @@
       ajax: {
          url: url,
          dataType: 'json',
-         data: function (term, page) {
+         type: 'POST',
+         data: function (params, page) {
+            query = params;
             return {
                ticket_id:         tickets_id,
                type : type,
                itilcategories_id: getItilcategories_id(),
-               searchText: term
+               searchText: params.term
             };
          },
          results: function (data, page) {
             var more = (data.count >= 100);
             return { results: data.results, more: more };
          }
       },
+      templateResult: formatResult,
       initSelection: function (element, callback) {
          var id = $(element).val();
          var defaultid = '0';
@@ -96,8 +99,7 @@
                });
             }
          }
-      },
-      templateResult: formatResult
+      }
    });
 };
 

diff --git a/setup.php b/setup.php
@@ -28,7 +28,7 @@
  @since     2009
  ---------------------------------------------------------------------- */
 
-define ('PLUGIN_ITILCATEGORYGROUPS_VERSION', '2.1.1');
+define ('PLUGIN_ITILCATEGORYGROUPS_VERSION', '2.1.2');
 
 // Minimal GLPI version, inclusive
 define("PLUGIN_ITILCATEGORYGROUPS_MIN_GLPI", "9.3");