Merge branch 'release/1.2.1'

pluginsGLPI · Oct 20, 2020 · dfa3ab5 · dfa3ab5
2 parents e00f748 + 7e4735a
commit dfa3ab5
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 27 deletions.
diff --git a/front/selfservice.php b/front/selfservice.php
@@ -5,5 +5,5 @@
 
 Html::helpHeader(__('Metbase'), $_SERVER["PHP_SELF"]);
 $central = new Central;
-PluginMetabaseDashboard::showForCentral($central);
+PluginMetabaseDashboard::showForCentral($central, 0, true);
 Html::helpFooter();
diff --git a/inc/dashboard.class.php b/inc/dashboard.class.php
@@ -60,7 +60,7 @@ static function displayTabContentForItem(CommonGLPI $item, $tabnum = 1, $withtem
     *
     * @return void
     */
-   static function showForCentral(Central $item, $withtemplate = 0) {
+   static function showForCentral(Central $item, $withtemplate = 0, $is_helpdesk = false) {
 
       $apiclient = new PluginMetabaseAPIClient();
 
@@ -95,7 +95,7 @@ function ($dashboard) {
          'current_dashboard',
          array_combine(array_column($dashboards, 'id'), array_column($dashboards, 'name')),
          [
-            'on_change' => 'reloadTab("uuid=" + $(this).val());',
+            'on_change' => ($is_helpdesk) ? 'location.href = location.origin+location.pathname+"?uuid="+$(this).val()' : 'reloadTab("uuid=" + $(this).val());',
             'value'     => $currentUuid
          ]
       );

diff --git a/locales/it_IT.mo b/locales/it_IT.mo
diff --git a/locales/it_IT.po b/locales/it_IT.po
@@ -5,6 +5,7 @@
 # 
 # Translators:
 # Pierfrancesco Passerini <p.passerini@gmail.com>, 2018
+# Emanuele Trotta <emanuele.trotta@axians.it>, 2020
 # 
 #, fuzzy
 msgid ""
@@ -13,7 +14,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-07-03 19:24+0000\n"
 "PO-Revision-Date: 2018-08-17 13:43+0000\n"
-"Last-Translator: Pierfrancesco Passerini <p.passerini@gmail.com>, 2018\n"
+"Last-Translator: Emanuele Trotta <emanuele.trotta@axians.it>, 2020\n"
 "Language-Team: Italian (Italy) (https://www.transifex.com/teclib/teams/28042/it_IT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,31 +24,33 @@ msgstr ""
 
 #: front/collections.php:5
 msgid "Metabase collections"
-msgstr ""
+msgstr "Raccolte di metabase"
 
 #: front/collections.php:15
 msgid "Reports and dashboards specifications"
-msgstr ""
+msgstr "Specifiche di report e dashboard"
 
 #: front/collections.php:31
 msgid "Extract questions from metabase:"
-msgstr ""
+msgstr "Estrai domande da metabase"
 
 #: front/collections.php:59
 msgid "Extract dashboards from metabase:"
-msgstr ""
+msgstr " Estrai dashboard da metabase:"
 
 #: front/collections.php:71
 msgid "Unable to access Metabase data. Please check plugin configuration."
 msgstr ""
+"Impossibile accedere ai dati di Metabase. Controlla la configurazione del "
+"plugin."
 
 #: front/profileright.form.php:13 front/profileright.form.php:40
 msgid "Invalid request."
 msgstr "Richiesta non valida."
 
 #: inc/apiclient.class.php:30
 msgid "API: login"
-msgstr ""
+msgstr "API: login"
 
 #: inc/apiclient.class.php:32
 msgid "API: get current user"
@@ -67,34 +70,38 @@ msgstr ""
 
 #: inc/apiclient.class.php:149
 msgid "No auto-generated GLPI database found"
-msgstr ""
+msgstr "Nessun database GLPI generato automaticamente trovato"
 
 #: inc/apiclient.class.php:628
 #, php-format
 msgid "Enabling embedded display fails for dashboard %s."
 msgstr ""
+"L'abilitazione della visualizzazione incorporata fallisce per la dashboard "
+"%s."
 
 #: inc/apiclient.class.php:802
 msgid ""
 "Query to metabase failed because operation timed out. Maybe you should "
 "increase the timeout value in plugin configuration"
 msgstr ""
+"Query su metabase non riuscita perché l'operazione è scaduta. Forse dovresti"
+" aumentare il valore di timeout nella configurazione del plugin"
 
 #: inc/profileright.class.php:20 inc/config.class.php:10
 msgid "Metabase"
 msgstr "Metabase"
 
 #: inc/profileright.class.php:79
 msgid "Rights management"
-msgstr ""
+msgstr "Gestione dei diritti"
 
 #: inc/profileright.class.php:86
 msgid "Allow access to all"
-msgstr ""
+msgstr "Consenti l'accesso a tutti"
 
 #: inc/profileright.class.php:88
 msgid "Disallow access to all"
-msgstr ""
+msgstr "Non consentire l'accesso a tutti"
 
 #: inc/config.class.php:59
 msgid "Metabase host"
@@ -110,7 +117,7 @@ msgstr "nome utente (metabase admin)"
 
 #: inc/config.class.php:106
 msgid "Metabase embedded token (to display dashboard in GLPI)"
-msgstr ""
+msgstr "Token di embed di metabase (per visualizzare la dashboard in GLPI)"
 
 #: inc/config.class.php:116
 msgid "Metabase url"
@@ -121,51 +128,53 @@ msgid ""
 "You may want to have a different dashboard url (with https for example) than"
 " the host (used to push the data) "
 msgstr ""
+"Potresti voler avere un URL della dashboard diverso (con https ad esempio) "
+"rispetto all'host (utilizzato per inviare i dati)"
 
 #: inc/config.class.php:127
 msgid "Timeout for sending data (in seconds)"
-msgstr ""
+msgstr "Timeout per l'invio dei dati (in secondi)"
 
 #: inc/config.class.php:148
 msgid "API status"
-msgstr ""
+msgstr "Stato API"
 
 #: inc/config.class.php:167
 msgid "Last Error"
-msgstr ""
+msgstr "Ultimo Errore"
 
 #: inc/config.class.php:182
 msgid "Action(s)"
-msgstr ""
+msgstr "Azione(i)"
 
 #: inc/config.class.php:191
 msgid "Previously stored database is not existing anymore."
-msgstr ""
+msgstr "Il database memorizzato in precedenza non esiste più."
 
 #: inc/config.class.php:193
 msgid "Create GLPI database in local Metabase"
-msgstr ""
+msgstr "Crea database GLPI in metabase locale"
 
 #: inc/config.class.php:199
 msgid "OR set an existing database: "
-msgstr ""
+msgstr "OPPURE imposta un database esistente:"
 
 #: inc/config.class.php:203
 msgid "Set database"
-msgstr ""
+msgstr "Imposta database"
 
 #: inc/config.class.php:211
 msgid "Push reports and dashboards in Metabase"
-msgstr ""
+msgstr "Esegui il push di report e dashboard in Metabase"
 
 #: inc/config.class.php:216
 msgid "(Re)generate datamodel in Metabase"
-msgstr ""
+msgstr "(Ri)genera datamodel in Metabase"
 
 #: inc/config.class.php:221
 msgid "Show reports and dashboards specifications"
-msgstr ""
+msgstr "Mostra le specifiche di report e dashboard"
 
 #: inc/dashboard.class.php:15
 msgid "Metabase dashboard"
-msgstr ""
+msgstr "dashboard di metabase"
diff --git a/metabase.xml b/metabase.xml
@@ -51,6 +51,11 @@ Il permet actuellement de:
       <author>Teclib'</author>
    </authors>
    <versions>
+      <version>
+         <num>1.2.1</num>
+         <compatibility>~9.5.0</compatibility>
+         <download_url>https://github.com/pluginsGLPI/metabase/releases/download/1.2.1/glpi-metabase-1.2.1.tar.bz2</download_url>
+      </version>
       <version>
          <num>1.2.0</num>
          <compatibility>~9.5.0</compatibility>

diff --git a/setup.php b/setup.php
@@ -26,7 +26,7 @@
  --------------------------------------------------------------------------
  */
 
-define('PLUGIN_METABASE_VERSION', '1.2.0');
+define('PLUGIN_METABASE_VERSION', '1.2.1');
 
 // Minimal GLPI version, inclusive
 define("PLUGIN_METABASE_MIN_GLPI", "9.5");