Merge branch 'release/1.3.2'

pluginsGLPI · Sep 4, 2018 · 90eff18 · 90eff18
2 parents 4b9edbd + 4dce9b4
commit 90eff18
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 6 deletions.
diff --git a/front/entity.form.php b/front/entity.form.php
@@ -27,6 +27,8 @@
 * @brief
 */
 
+use Glpi\Event;
+
 include ('../../../inc/includes.php');
 
 Session::haveRight("entity", UPDATE);

diff --git a/inc/entity.class.php b/inc/entity.class.php
@@ -61,7 +61,7 @@ static function displayTabContentForItem(CommonGLPI $item, $tabnum = 1, $withtem
     * @param $item    CommonDBTM object
    **/
    public static function countForItem(CommonDBTM $item) {
-      return countElementsInTable(self::getTable(), "`entities_id` = '".$item->getID()."'");
+      return countElementsInTable(self::getTable(), ['entities_id' => $item->getID()]);
    }
 
    public function post_purgeItem() {
@@ -363,7 +363,7 @@ static function install(Migration $migration) {
                      KEY `plugin_credit_types_id` (`plugin_credit_types_id`),
                      KEY `begin_date` (`begin_date`),
                      KEY `end_date` (`end_date`)
-                  ) ENGINE=MyISAM  DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci";
+                  ) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci";
          $DB->query($query) or die($DB->error());
       }
    }

diff --git a/inc/ticket.class.php b/inc/ticket.class.php
@@ -63,7 +63,7 @@ static function displayTabContentForItem(CommonGLPI $item, $tabnum = 1, $withtem
     * @param $item    CommonDBTM object
    **/
    public static function countForItem(CommonDBTM $item) {
-      return countElementsInTable(self::getTable(), "`tickets_id` = '".$item->getID()."'");
+      return countElementsInTable(self::getTable(), ['tickets_id' => $item->getID()]);
    }
 
    /**
@@ -576,7 +576,7 @@ static function install(Migration $migration) {
                      KEY `date_creation` (`date_creation`),
                      KEY `consumed` (`consumed`),
                      KEY `users_id` (`users_id`)
-                  ) ENGINE=MyISAM  DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci";
+                  ) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci";
          $DB->query($query) or die($DB->error());
       } else {
 

diff --git a/inc/type.class.php b/inc/type.class.php
@@ -70,7 +70,7 @@ static function install(Migration $migration) {
                      KEY `is_recursive` (`is_recursive`),
                      KEY `date_mod` (`date_mod`),
                      KEY `date_creation` (`date_creation`)
-                  ) ENGINE=MyISAM  DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci";
+                  ) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci";
          $DB->query($query) or die($DB->error());
       }
    }

diff --git a/plugin.xml b/plugin.xml
@@ -8,10 +8,12 @@
       <short>
          <fr><![CDATA[Ce plugin vous permet de déclarer et suivre (par entité) les consommations de différents coupons de crédits directement à partir du formulaire Ticket.]]></fr>
          <en><![CDATA[This plugin allows you to declare and follow (by entity) the consumptions of different credit vouchers directly from the Ticket form.]]></en>
+         <cs><![CDATA[Tento zásuvný modul umožňuje deklarovat a evidovat (podle entity) spotřebu různých kuponů s kredity přímo z formuláře požadavku.]]></cs>
       </short>
       <long>
          <fr><![CDATA[Ce plugin vous permet de déclarer et suivre (par entité) les consommations de différents coupons de crédits directement à partir du formulaire Ticket.]]></fr>
          <en><![CDATA[This plugin allows you to declare and follow (by entity) the consumptions of different credit vouchers directly from the Ticket form.]]></en>
+         <cs><![CDATA[Tento zásuvný modul umožňuje deklarovat a evidovat (podle entity) spotřebu různých kuponů s kredity přímo z formuláře požadavku.]]></cs>
       </long>
    </description>
    <homepage>https://pluginsglpi.github.io/credit/</homepage>
@@ -22,6 +24,10 @@
       <author>TECLIB'</author>
    </authors>
    <versions>
+      <version>
+         <num>1.3.2</num>
+          <compatibility>9.3</compatibility>
+      </version>
       <version>
          <num>1.3.1</num>
           <compatibility>9.3</compatibility>
@@ -52,6 +58,7 @@
       </version>
    </versions>
    <langs>
+      <lang>cs_CZ</lang>
       <lang>fr_FR</lang>
       <lang>en_GB</lang>
    </langs>
@@ -74,6 +81,14 @@
             <tag>management</tag>
             <tag>ticket</tag>
          </en>
+         <cs>
+            <tag>služba podpory</tag>
+            <tag>služby</tag>
+            <tag>kupony</tag>
+            <tag>kredity</tag>
+            <tag>správa</tag>
+            <tag>požadavek</tag>
+         </cs>
    </tags>
    <screenshots>
       <screenshot>https://raw.githubusercontent.com/pluginsGLPI/credit/master/screenshots/fr_ticket-tab.png</screenshot>

diff --git a/setup.php b/setup.php
@@ -23,7 +23,7 @@
  * -------------------------------------------------------------------------
  */
 
-define('PLUGIN_CREDIT_VERSION', '1.3.1');
+define('PLUGIN_CREDIT_VERSION', '1.3.2');
 
 // Minimal GLPI version, inclusive
 define("PLUGIN_CREDIT_MIN_GLPI", "9.3");