Merge branch 'support/2.13.0' into support/2.14.0

pluginsGLPI · Feb 12, 2024 · 9c5a2c2 · 9c5a2c2
2 parents a0d5c81 + 5645454
commit 9c5a2c2
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/inc/formanswer.class.php b/inc/formanswer.class.php
@@ -995,7 +995,7 @@ public function prepareInputForUpdate($input) {
     * @return boolean true if pre_delete actions succeeded, false if not
     */
    public function pre_deleteItem() {
-      global $DB;
+      global $DB, $CFG_GLPI;
 
       $issue = new PluginFormcreatorIssue();
       $issue->deleteByCriteria([
@@ -1008,6 +1008,8 @@ public function pre_deleteItem() {
          self::getForeignKeyField() => $this->getID(),
       ]);
 
+      $CFG_GLPI['keep_tickets_on_delete'] = '1';
+
       return true;
    }
 

diff --git a/plugin.xml b/plugin.xml
@@ -58,6 +58,11 @@ Features
       <author>Teclib'</author>
    </authors>
    <versions>
+      <version>
+         <num>2.13.9</num>
+         <compatibility>~10.0.7</compatibility>
+         <download_url>https://github.com/pluginsGLPI/formcreator/releases/download/2.13.9/glpi-formcreator-2.13.9.tar.bz2</download_url>
+      </version>
       <version>
          <num>2.13.8</num>
          <compatibility>~10.0</compatibility>

diff --git a/setup.php b/setup.php
@@ -40,7 +40,7 @@
 define('PLUGIN_FORMCREATOR_IS_OFFICIAL_RELEASE', true);
 
 // Minimal GLPI version, inclusive
-define ('PLUGIN_FORMCREATOR_GLPI_MIN_VERSION', '10.0.5');
+define ('PLUGIN_FORMCREATOR_GLPI_MIN_VERSION', '10.0.7');
 // Maximum GLPI version, exclusive (ignored if PLUGIN_FORMCREATOR_IS_OFFICIAL_RELEASE == false)
 define ('PLUGIN_FORMCREATOR_GLPI_MAX_VERSION', '10.2');