From 4a7203f40e0a49e40780f6b90e50b6d7a9252697 Mon Sep 17 00:00:00 2001 From: Alexandre Delaunay Date: Tue, 16 Oct 2018 15:23:56 +0200 Subject: [PATCH 1/4] remove behavior which fobid to close a select after choosing an option --- scripts/filtergroups.js.php | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/filtergroups.js.php b/scripts/filtergroups.js.php index 8c662c0..8374d7f 100644 --- a/scripts/filtergroups.js.php +++ b/scripts/filtergroups.js.php @@ -54,7 +54,6 @@ minimumInputLength: 0, quietMillis: 100, minimumResultsForSearch: {$CFG_GLPI['ajax_limit_count']}, - closeOnSelect: false, ajax: { url: url, dataType: 'json', From 1d3f63102e059fdb0e62f5ed87c5917f870cfa1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Anne?= Date: Fri, 19 Oct 2018 14:49:47 +0200 Subject: [PATCH 2/4] Fix usage of 'formatResult'; fixes #24 --- scripts/filtergroups.js.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/scripts/filtergroups.js.php b/scripts/filtergroups.js.php index 8374d7f..b5cc3c5 100644 --- a/scripts/filtergroups.js.php +++ b/scripts/filtergroups.js.php @@ -49,6 +49,10 @@ }; var redefineDropdown = function (id, url, tickets_id, type) { + if (typeof templateResult === "undefined" && typeof formatResult !== "undefined") { + var templateResult = formatResult; + } + $('#' + id).select2({ width: '80%', minimumInputLength: 0, @@ -72,7 +76,7 @@ return { results: data.results, more: more }; } }, - templateResult: formatResult, + templateResult: templateResult, initSelection: function (element, callback) { var id = $(element).val(); var defaultid = '0'; From 0d7727b4f749a8c730a089f71885d3ad2a6f086d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Anne?= Date: Fri, 26 Oct 2018 14:49:17 +0200 Subject: [PATCH 3/4] Update locales --- locales/it_IT.mo | Bin 991 -> 1057 bytes locales/it_IT.po | 7 ++++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/locales/it_IT.mo b/locales/it_IT.mo index 9696471429c299c69795200c80666c8e66d29ba3..84774d3b1693df6ec7117df85aedda785bf55f55 100644 GIT binary patch delta 357 zcmcc5zL2B-o)F7a1|Z-9Vi_RL0b*Vt-UGxS@BxT5fcPU23j?tfBLf2)kk$jz>_FNS zO4~wdS19cZqy>TUp+H&+NT&no$3WZ!#AZN#8Z!ff7z0B+!(1Q(WY88M%?YIUKG#EH4r=OmWo7g;F;WTqCS w0r|V!Z delta 285 zcmZ3;ai6{Zo)F7a1|Z-BVi_P#0b*VtUIWA+@BoN4fcPO03j;A1BLf3Fkd}keYEW7a zN}B;`L7==Hkd^|{0YLfy5N89i8IZ5T%)lT9q?3U((9S4^DhPw21xoip=@~#;9H?*+ zkX8ZGyMQ#%34;ruQ(^MB)`Z?!TIpYl%mXJ1;@O+)XnisF^rQBGsgh{a^fSx diff --git a/locales/it_IT.po b/locales/it_IT.po index 37ec20e..d826f39 100644 --- 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 , 2018 # Giudy , 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 \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 From 11b390730ee47fe4832c98431ec714b9dbbe3623 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Anne?= Date: Fri, 26 Oct 2018 14:50:49 +0200 Subject: [PATCH 4/4] Add 2.1.3 version definition --- itilcategorygroups.xml | 4 ++++ setup.php | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/itilcategorygroups.xml b/itilcategorygroups.xml index a32cb68..97fe408 100644 --- 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 François Legastelois + + 2.1.3 + 9.3 + 2.1.2 9.3 diff --git a/setup.php b/setup.php index d3b3b5d..0584ff4 100644 --- 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");