Merge branch 'release/2.1.1'

pluginsGLPI · Sep 4, 2018 · 22aa33e · 22aa33e
2 parents 2eefb56 + da1d034
commit 22aa33e
Show file tree

Hide file tree

Showing 8 changed files with 85 additions and 9 deletions.
diff --git a/inc/category.class.php b/inc/category.class.php
@@ -267,7 +267,7 @@ static function getSQLCondition($tickets_id, $itilcategories_id, $type) {
                } else {
                   foreach ($found_groups['groups_id_level'.$lvl] as $groups_id) {
                      if (countElementsInTableForEntity("glpi_groups", $ticket->getEntityID(),
-                                                       "`id`='$groups_id'") > 0) {
+                                                       ['id' => $groups_id]) > 0) {
                         $group->getFromDB($groups_id);
                         $groups_id_toshow[] = $group->getID();
                      }
@@ -623,7 +623,7 @@ static function install(Migration $migration) {
          KEY `is_request` (`is_request`),
          KEY `is_recursive` (`is_recursive`),
          KEY date_mod (date_mod)
-         ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=1;";
+         ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=1;";
          $DB->query($query);
       }
 

diff --git a/inc/category_group.class.php b/inc/category_group.class.php
@@ -21,7 +21,7 @@ static function install(Migration $migration) {
          KEY `level`                                   (`level`),
          KEY `itilcategories_id`                       (`itilcategories_id`),
          KEY `groups_id`                               (`groups_id`)
-         ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=1;";
+         ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=1;";
          $DB->query($query);
       }
 

diff --git a/inc/group_level.class.php b/inc/group_level.class.php
@@ -33,7 +33,7 @@ static function install(Migration $migration) {
          PRIMARY KEY (`id`),
          KEY         `groups_id` (`groups_id`),
          KEY         `lvl` (`lvl`)
-      ) ENGINE=MyISAM  DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci");
+      ) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci");
    }
 
    static function uninstall() {

diff --git a/itilcategorygroups.xml b/itilcategorygroups.xml
@@ -7,6 +7,7 @@
       <short>
          <en>This plugins aims to filter assignable groups in ticket by selected category</en>
          <fr>Ce plugin apporte le filtrage des groupes "attribués à" en fonction de la catégorie du ticket</fr>
+         <cs>Tento zásuvný modul cílí na filtrování skupin přiřaditelných v požadavku v závislosti na vybrané kategorii</cs>
       </short>
       <long>
          <en>This plugins aims to filter assignable groups in ticket by selected category.
@@ -18,6 +19,10 @@ Then, for each of your ticket's categories, you can define which group will be v
 Vous pouvez définir un niveau (parmis 4) pour vos groupes glpi.
 Ensuite, pour chacune des vos catégories, vous pouvez définir quel group sera visible ou non.
          </fr>
+         <cs>Tento zásuvný modul cílí na filtrování skupin přiřaditelných v požadavku v závislosti na vybrané kategorii.
+
+Je možné určit stupeň k vašim glpi skupinám.
+Potom, pro každou z kategorií požadavku je možné určit která skupina bude zobrazena a které ne.</cs>
       </long>
    </description>
    <homepage>https://github.com/pluginsGLPI/itilcategorygroups</homepage>
@@ -32,6 +37,10 @@ Ensuite, pour chacune des vos catégories, vous pouvez définir quel group sera
       <author>François Legastelois</author>
    </authors>
    <versions>
+      <version>
+         <num>2.1.1</num>
+         <compatibility>9.3</compatibility>
+      </version>
       <version>
          <num>2.1.0</num>
          <compatibility>9.3</compatibility>
@@ -80,6 +89,7 @@ Ensuite, pour chacune des vos catégories, vous pouvez définir quel group sera
       </version>
    </versions>
    <langs>
+      <lang>cs_CZ</lang>
       <lang>en_GB</lang>
       <lang>fr_FR</lang>
    </langs>
@@ -90,11 +100,17 @@ Ensuite, pour chacune des vos catégories, vous pouvez définir quel group sera
          <tag>Category</tag>
          <tag>Filter</tag>
       </en>
-      <lang>
+      <fr>
          <tag>Assistance</tag>
          <tag>Categorie</tag>
          <tag>Filtre</tag>
-      </lang>
+      </fr>
+      <cs>
+         <tag>Služba podpory</tag>
+         <tag>Kategorie</tag>
+         <tag>Filtr</tag>
+      </cs>
+
    </tags>
    <screenshots>
       <screenshot>https://raw.githubusercontent.com/PluginsGLPI/itilcategorygroups/master/screenshots/category_config.png</screenshot>

diff --git a/locales/zh_CN.mo b/locales/zh_CN.mo
diff --git a/locales/zh_CN.po b/locales/zh_CN.po
@@ -0,0 +1,60 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# liAnGjiA <[email protected]>, 2018
+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-07-07 03:52+0000\n"
+"Last-Translator: liAnGjiA <[email protected]>\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/teclib/glpi-plugin-itilcategorygroups/language/zh_CN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: hook.php:77
+msgid "Level "
+msgstr "级别"
+
+#: hook.php:95 inc/category.class.php:97 inc/category.class.php:459
+#: inc/group_level.class.php:92
+msgid "Level 1"
+msgstr "级别 1"
+
+#: hook.php:96 inc/category.class.php:101 inc/category.class.php:483
+#: inc/group_level.class.php:93
+msgid "Level 2"
+msgstr "级别 2"
+
+#: hook.php:97 inc/category.class.php:106 inc/category.class.php:507
+#: inc/group_level.class.php:94
+msgid "Level 3"
+msgstr "级别 3"
+
+#: hook.php:98 inc/category.class.php:110 inc/category.class.php:531
+#: inc/group_level.class.php:95
+msgid "Level 4"
+msgstr "级别 4"
+
+#: inc/category.class.php:42 inc/category.class.php:385 inc/menu.class.php:6
+msgid "Link ItilCategory - Groups"
+msgstr ""
+
+#: inc/category.class.php:175
+msgid "A link with this category already exists"
+msgstr ""
+
+#: inc/menu.class.php:10 inc/group_level.class.php:50 setup.php:77
+msgid "ItilCategory Groups"
+msgstr ""
+
+#: inc/group_level.class.php:14 inc/group_level.class.php:87
+#: inc/group_level.class.php:121
+msgid "Level attribution"
+msgstr "级别属性"
diff --git a/scripts/filtergroups.js.php b/scripts/filtergroups.js.php
@@ -24,8 +24,8 @@
    if (getItilcategories_id() == 0) {
       return;
    } else {
-      checkDOMChange("input[name='_itil_assign[groups_id]']", function() {
-         var assign_select_dom_id = $("input[name='_itil_assign[groups_id]']")[0].id;
+      checkDOMChange("select[name='_itil_assign[groups_id]']", function() {
+         var assign_select_dom_id = $("select[name='_itil_assign[groups_id]']")[0].id;
          var type = $("select[id^='dropdown_type']").val();
 
          redefineDropdown(assign_select_dom_id, groups_url, tickets_id, type);

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