Evarisk#3382 [SQL] fix: handle database rename

evarisk-micka · Oct 12, 2023 · 02f6467 · 02f6467
1 parent 549cf80
commit 02f6467
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/core/modules/modDigiriskDolibarr.class.php b/core/modules/modDigiriskDolibarr.class.php
@@ -2180,15 +2180,14 @@ public function init($options = '')
 
         $documentsPath = DOL_DATA_ROOT . ($conf->entity > 1 ? '/' . $conf->entity : '');
         $mediaPath     =  $documentsPath . '/digiriskdolibarr';
-        $ecmPath       =  $documentsPath . '/ecm/digiriskdolibarr';
 
         if (is_dir($mediaPath . '/accident_investigation')) {
             chmod($mediaPath . '/accident_investigation', 0755);
             rename($mediaPath . '/accident_investigation', $mediaPath . '/accidentinvestigation');
         }
-        if (is_dir($ecmPath . '/accident_investigationdocument')) {
-            chmod($ecmPath . '/accident_investigationdocument', 0755);
-            rename($ecmPath . '/accident_investigationdocument', $ecmPath . '/accidentinvestigationdocument');
+        if (is_dir($mediaPath . '/accident_investigationdocument')) {
+            chmod($mediaPath . '/accident_investigationdocument', 0755);
+            rename($mediaPath . '/accident_investigationdocument', $mediaPath . '/accidentinvestigationdocument');
         }
 
 		return $this->_init($sql, $options);

diff --git a/sql/update.sql b/sql/update.sql
@@ -227,3 +227,7 @@ DELETE FROM llx_c_digiriskdolibarr_action_trigger WHERE ref = 'ACCIDENT_INVESTIG
 
 UPDATE `llx_const` SET `value` = 'mod_accidentinvestigation_standard' WHERE `llx_const`.`name` = 'DIGIRISKDOLIBARR_ACCIDENTINVESTIGATION_ADDON';
 UPDATE `llx_const` SET `value` = 'mod_accidentinvestigationdocument_standard' WHERE `llx_const`.`name` = 'DIGIRISKDOLIBARR_ACCIDENTINVESTIGATIONDOCUMENT_ADDON';
+INSERT INTO llx_c_accidentinvestigation_attendants_role SELECT * FROM llx_c_accident_investigation_attendants_role;
+INSERT INTO llx_categorie_accidentinvestigation SELECT * FROM llx_categorie_accident_investigation;
+DROP DATABASE llx_c_accident_investigation_attendants_role;
+DROP DATABASE llx_categorie_accident_investigation;