Finish remaining small issues for progress in install

glpi-project · Nov 21, 2024 · ddbaf78 · ddbaf78
1 parent ed9c4e8
commit ddbaf78
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/js/glpi_install.js b/js/glpi_install.js
@@ -121,7 +121,7 @@
                     if (json.started_at) {
                         if (json.finished_at) {
                             // Finished, nothing else to do!
-                            updateProgress(single_message_element, progress_element, 1, 1);
+                            updateProgress(single_message_element, progress_element, 1, 1, json.data);
                             return;
                         }
 

diff --git a/src/Toolbox.php b/src/Toolbox.php
@@ -2105,7 +2105,7 @@ public static function createSchema($lang = 'en_GB', ?DBmysql $database = null,
         foreach ($tables as $data) {
             $number_of_queries += \count($data);
         }
-        $number_of_queries += 7; // For other calls :)
+        $number_of_queries += 8; // For other calls
         if (defined('GLPI_SYSTEM_CRON')) { $number_of_queries++; }
 
         $progressCallback(null, $number_of_queries, __('Creating database structure…'));
@@ -2185,6 +2185,8 @@ public static function createSchema($lang = 'en_GB', ?DBmysql $database = null,
                 ]
             );
         }
+
+        $progressCallback($number_of_queries, $number_of_queries, __('Done!'));
     }