Merge branch 'release/2.1.3'

pluginsGLPI · Oct 26, 2018 · bdc82d5 · bdc82d5
2 parents 15c14b3 + 11b3907
commit bdc82d5
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 6 deletions.
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.3</num>
+         <compatibility>9.3</compatibility>
+      </version>
       <version>
          <num>2.1.2</num>
          <compatibility>9.3</compatibility>

diff --git a/locales/it_IT.mo b/locales/it_IT.mo
diff --git a/locales/it_IT.po b/locales/it_IT.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Pierfrancesco Passerini <[email protected]>, 2018
 # Giudy <[email protected]>, 2017
 msgid ""
 msgstr ""
 "Project-Id-Version: GLPI Plugin - Itilcategorygroups\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-06-22 14:52+0000\n"
-"PO-Revision-Date: 2018-06-22 14:53+0000\n"
-"Last-Translator: Cédric Anne\n"
+"PO-Revision-Date: 2018-09-25 13:40+0000\n"
+"Last-Translator: Pierfrancesco Passerini <[email protected]>\n"
 "Language-Team: Italian (Italy) (http://www.transifex.com/teclib/glpi-plugin-itilcategorygroups/language/it_IT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,7 +21,7 @@ msgstr ""
 
 #: hook.php:77
 msgid "Level "
-msgstr ""
+msgstr "Livello"
 
 #: hook.php:95 inc/category.class.php:97 inc/category.class.php:459
 #: inc/group_level.class.php:92

diff --git a/scripts/filtergroups.js.php b/scripts/filtergroups.js.php
@@ -49,12 +49,15 @@
 };
 
 var redefineDropdown = function (id, url, tickets_id, type) {
+   if (typeof templateResult === "undefined" && typeof formatResult !== "undefined") {
+      var templateResult = formatResult;
+   }
+
    $('#' + id).select2({
       width:                   '80%',
       minimumInputLength:      0,
       quietMillis:             100,
       minimumResultsForSearch: {$CFG_GLPI['ajax_limit_count']},
-      closeOnSelect:           false,
       ajax: {
          url: url,
          dataType: 'json',
@@ -73,7 +76,7 @@
             return { results: data.results, more: more };
          }
       },
-      templateResult: formatResult,
+      templateResult: templateResult,
       initSelection: function (element, callback) {
          var id = $(element).val();
          var defaultid = '0';

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