Bump version

pluginsGLPI · Apr 25, 2022 · eb9aa9c · eb9aa9c
1 parent 288ab05
commit eb9aa9c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/inc/dashboard.class.php b/inc/dashboard.class.php
@@ -242,8 +242,7 @@ function addDateCriteria(&$query, $dateBegin, $dateEnd){
 
          // Survey not answered
          $query = "SELECT count(*) as nb FROM " . TicketSatisfaction::getTable();
-         $query .= " WHERE 1=1";
-         $query .= " AND date_answered IS NULL";
+         $query .= " WHERE date_answered IS NULL";
          addDateCriteria($query, $opt['begin'], $opt['end']);
 
          $result = $DB->query($query);
@@ -256,8 +255,7 @@ function addDateCriteria(&$query, $dateBegin, $dateEnd){
 
          // Survey answered
          $query = "SELECT count(DISTINCT tickets_id) as nb FROM " . TicketSatisfaction::getTable();
-         $query .= " WHERE 1=1";
-         $query .= " AND date_answered IS NOT NULL";
+         $query .= " WHERE date_answered IS NOT NULL";
          addDateCriteria($query, $opt['begin'], $opt['end']);
 
          $result = $DB->query($query);
@@ -270,8 +268,7 @@ function addDateCriteria(&$query, $dateBegin, $dateEnd){
 
          // Global satisfaction
          $query = "SELECT AVG(satisfaction) as nb FROM " . TicketSatisfaction::getTable();
-         $query .= " WHERE 1=1";
-         $query .= " AND date_answered IS NOT NULL";
+         $query .= " WHERE date_answered IS NOT NULL";
          addDateCriteria($query, $opt['begin'], $opt['end']);
 
          $result = $DB->query($query);

diff --git a/satisfaction.xml b/satisfaction.xml
@@ -88,6 +88,11 @@
         <author>Infotel</author>
     </authors>
     <versions>
+        <version>
+            <num>1.6.0</num>
+            <compatibility>~10.0</compatibility>
+            <download_url>https://github.com/pluginsGLPI/satisfaction/releases/download/1.6.0/glpi-satisfaction-1.6.0.tar.bz2</download_url>
+        </version>
         <version>
             <num>1.6.0-rc1</num>
             <compatibility>~10.0</compatibility>

diff --git a/setup.php b/setup.php
@@ -31,7 +31,7 @@
  * Init the hooks of the plugins -Needed
  */
 
-define ("PLUGIN_SATISFACTION_VERSION", "1.6.0-rc1");
+define ("PLUGIN_SATISFACTION_VERSION", "1.6.0");
 
 // Minimal GLPI version, inclusive
 define('PLUGIN_SATISFACTION_MIN_GLPI', '10.0');