Merge branch 'master' into 9.3-bugfixes

InfotelGLPI · Jun 6, 2018 · f338260 · f338260
2 parents b4b5fd3 + 61a647a
commit f338260
Show file tree

Hide file tree

Showing 11 changed files with 45 additions and 50 deletions.
diff --git a/ajax/loadscripts.php b/ajax/loadscripts.php
@@ -29,7 +29,7 @@
 
 include ('../../../inc/includes.php');
 
-Html::header_nocache();
+//Html::header_nocache();
 Session::checkLoginUser();
 header("Content-Type: text/html; charset=UTF-8");
 

diff --git a/ajax/ticket.php b/ajax/ticket.php
@@ -30,8 +30,7 @@
 include ('../../../inc/includes.php');
 
 Session::checkLoginUser();
-
-//Html::header_nocache();
+Html::header_nocache();
 
 if (!isset($_POST['tickets_id']) || empty($_POST['tickets_id'])){
    $_POST['tickets_id'] = 0;
@@ -41,6 +40,7 @@
    case 'changeUrgency':
       header("Content-Type: text/html; charset=UTF-8");
       $item = new PluginSeasonalityItem();
+
       echo json_encode($item->getUrgencyFromCategory($_POST['itilcategories_id'], $_POST['tickets_id'], $_POST['date'], $_POST['type'], $_POST['entities_id']));
       break;
 }
diff --git a/inc/iteminjection.class.php b/inc/iteminjection.class.php
@@ -34,7 +34,7 @@
 class PluginSeasonalityItemInjection extends PluginSeasonalityItem
    implements PluginDatainjectionInjectionInterface {
 
-   static function getTable() {
+   static function getTable($classname = null) {
 
       $parenttype = get_parent_class();
       return $parenttype::getTable();

diff --git a/inc/seasonalityinjection.class.php b/inc/seasonalityinjection.class.php
@@ -34,7 +34,7 @@
 class PluginSeasonalitySeasonalityInjection extends PluginSeasonalitySeasonality
    implements PluginDatainjectionInjectionInterface {
 
-   static function getTable() {
+   static function getTable($classname = null) {
 
       $parenttype = get_parent_class();
       return $parenttype::getTable();

diff --git a/locales/en_GB.mo b/locales/en_GB.mo
diff --git a/locales/en_GB.po b/locales/en_GB.po
@@ -2,75 +2,74 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-07-01 12:13+0200\n"
-"PO-Revision-Date: 2016-09-26 12:13+0200\n"
+"POT-Creation-Date: 2018-05-29 10:00+0200\n"
+"PO-Revision-Date: 2018-05-29 10:21+0200\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: en_GB\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.9\n"
+"X-Generator: Poedit 2.0.6\n"
 "X-Poedit-Basepath: .\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: setup.php:78 inc/item.class.php:680 inc/profile.class.php:40
-#: inc/profile.class.php:129 inc/seasonality.class.php:42
+#: setup.php:80 inc/item.class.php:720 inc/profile.class.php:44
+#: inc/profile.class.php:133 inc/seasonality.class.php:43
 msgid "Seasonality"
 msgid_plural "Seasonalities"
 msgstr[0] "Seasonality"
 msgstr[1] "Seasonalities"
 
-#: setup.php:90
-msgid "This plugin requires GLPI >= 0.85"
-msgstr "This plugin requires GLPI >= 0.85"
-
-#: inc/item.class.php:42
+#: inc/item.class.php:43
 msgid "Seasonality item"
 msgid_plural "Seasonality items"
 msgstr[0] "Seasonality item"
 msgstr[1] "Seasonality items"
 
-#: inc/item.class.php:170
+#: inc/item.class.php:171
 msgid "Add a category"
 msgstr "Add a category"
 
-#: inc/item.class.php:567
+#: inc/item.class.php:607
 msgid "Add seasonality"
 msgstr "Add seasonality"
 
-#: inc/item.class.php:568
+#: inc/item.class.php:608
 msgid "Delete seasonality"
 msgstr "Delete seasonality"
 
-#: inc/item.class.php:713
+#: inc/item.class.php:753
 msgid "Cannot add two seasonalities with same date interval"
 msgstr "Cannot add two seasonalities with same date interval"
 
-#: inc/seasonality.class.php:71
+#: inc/seasonality.class.php:72
 msgid "Date range"
 msgstr "Date range"
 
-#: inc/seasonality.class.php:80
+#: inc/seasonality.class.php:81
 msgid "Clear"
 msgstr "Clear"
 
-#: inc/seasonality.class.php:82
+#: inc/seasonality.class.php:83
 msgid "Select date range..."
 msgstr "Select date range..."
 
-#: inc/seasonality.class.php:88
+#: inc/seasonality.class.php:89
 msgid "Today"
 msgstr "Today"
 
-#: inc/seasonality.class.php:92
+#: inc/seasonality.class.php:93
 msgid "Tomorrow"
 msgstr "Tomorrow"
 
-#: inc/seasonality.class.php:96
+#: inc/seasonality.class.php:97
 msgid "Next 7 Days"
 msgstr "Next 7 Days"
 
-#: inc/seasonality.class.php:100
+#: inc/seasonality.class.php:101
 msgid "Next Week"
 msgstr "Next Week"
+
+#~ msgid "This plugin requires GLPI >= 0.85"
+#~ msgstr "This plugin requires GLPI >= 0.85"
diff --git a/locales/fr_FR.mo b/locales/fr_FR.mo
diff --git a/locales/fr_FR.po b/locales/fr_FR.po
@@ -2,29 +2,25 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-26 12:12+0200\n"
-"PO-Revision-Date: 2016-09-26 12:12+0200\n"
+"POT-Creation-Date: 2018-05-29 10:00+0200\n"
+"PO-Revision-Date: 2018-05-29 10:21+0200\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: fr_FR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.9\n"
+"X-Generator: Poedit 2.0.6\n"
 "X-Poedit-Basepath: .\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: setup.php:78 inc/item.class.php:706 inc/profile.class.php:44
+#: setup.php:80 inc/item.class.php:720 inc/profile.class.php:44
 #: inc/profile.class.php:133 inc/seasonality.class.php:43
 msgid "Seasonality"
 msgid_plural "Seasonalities"
 msgstr[0] "Saisonnalité"
 msgstr[1] "Saisonnalités"
 
-#: setup.php:90
-msgid "This plugin requires GLPI >= 0.90"
-msgstr "Ce plugin nécessite GLPI >= 0.90"
-
 #: inc/item.class.php:43
 msgid "Seasonality item"
 msgid_plural "Seasonality items"
@@ -35,15 +31,15 @@ msgstr[1] "Eléments de saisonnalité"
 msgid "Add a category"
 msgstr "Ajouter une catégorie"
 
-#: inc/item.class.php:593
+#: inc/item.class.php:607
 msgid "Add seasonality"
 msgstr "Ajouter une saisonnalité"
 
-#: inc/item.class.php:594
+#: inc/item.class.php:608
 msgid "Delete seasonality"
 msgstr "Supprimer une saisonnalité"
 
-#: inc/item.class.php:739
+#: inc/item.class.php:753
 msgid "Cannot add two seasonalities with same date interval"
 msgstr "Ajout impossible, une saisonnalité existe déja sur cet intervalle de date"
 
@@ -75,5 +71,8 @@ msgstr "Les 7 prochains jours"
 msgid "Next Week"
 msgstr "La semaine suivante"
 
+#~ msgid "This plugin requires GLPI >= 0.90"
+#~ msgstr "Ce plugin nécessite GLPI >= 0.90"
+
 #~ msgid "This plugin requires GLPI >= 0.85"
 #~ msgstr "Ce plugin requiert GLPI >= 0.85"
diff --git a/locales/glpi.pot b/locales/glpi.pot
@@ -1,14 +1,14 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Seasonality Development Team
-# This file is distributed under the same license as the PACKAGE package.
+# This file is distributed under the same license as the GLPI - Seasonality plugin package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: GLPI - Seasonality plugin 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-26 12:11+0200\n"
+"POT-Creation-Date: 2018-05-29 10:00+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,17 +18,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: setup.php:78 inc/item.class.php:706 inc/profile.class.php:44
+#: setup.php:80 inc/item.class.php:720 inc/profile.class.php:44
 #: inc/profile.class.php:133 inc/seasonality.class.php:43
 msgid "Seasonality"
 msgid_plural "Seasonalities"
 msgstr[0] ""
 msgstr[1] ""
 
-#: setup.php:90
-msgid "This plugin requires GLPI >= 0.90"
-msgstr ""
-
 #: inc/item.class.php:43
 msgid "Seasonality item"
 msgid_plural "Seasonality items"
@@ -39,15 +35,15 @@ msgstr[1] ""
 msgid "Add a category"
 msgstr ""
 
-#: inc/item.class.php:593
+#: inc/item.class.php:607
 msgid "Add seasonality"
 msgstr ""
 
-#: inc/item.class.php:594
+#: inc/item.class.php:608
 msgid "Delete seasonality"
 msgstr ""
 
-#: inc/item.class.php:739
+#: inc/item.class.php:753
 msgid "Cannot add two seasonalities with same date interval"
 msgstr ""
 

diff --git a/scripts/seasonality.js b/scripts/seasonality.js
@@ -1,6 +1,5 @@
 (function ($) {
     $.fn.seasonality = function (options) {
-
         var object = this;
         init();
 
@@ -28,10 +27,8 @@
             $(document).ready(function () {
                 // Get tickets_id
                 var tickets_id = object.urlParam(window.location.href, 'id');
-
                 // CENTRAL
                 if (location.pathname.indexOf('ticket.form.php') > 0 && !object.isIE()) {
-
                     // Launched on each complete Ajax load
                     $(document).ajaxComplete(function (event, xhr, option) {
                         // We execute the code only if the central form display request is done

diff --git a/seasonality.xml b/seasonality.xml
@@ -23,6 +23,10 @@
       <author>Infotel</author>
    </authors>
    <versions>
+       <version>
+           <num>1.3.0</num>
+           <compatibility>9.2</compatibility>
+       </version>
       <version>
           <num>1.2.0</num>
           <compatibility>9.1</compatibility>