fix return value use

glpi-project · Apr 11, 2024 · 1afc8eb · 1afc8eb
1 parent ad0832b
commit 1afc8eb
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 9 deletions.
diff --git a/src/Html.php b/src/Html.php
@@ -839,8 +839,8 @@ public static function getConfirmationOnActionScript($string, $additionalactions
      *
      * @since 0.85
      *
-     * @param $id                 HTML ID of the progress bar
-     * @param $options    array   progress status
+     * @param string $id HTML ID of the progress bar
+     * @param array $options progress status options
      *                    - create    do we have to create it ?
      *                    - message   add or change the message
      *                    - percent   current level
@@ -850,7 +850,6 @@ public static function getConfirmationOnActionScript($string, $additionalactions
      **/
     public static function progressBar($id, array $options = [])
     {
-
         $params = [
             'create'    => false,
             'message'   => null,
@@ -938,17 +937,23 @@ public static function progressBar($id, array $options = [])
      * Create a Dynamic Progress Bar
      *
      * @param string $msg  initial message (under the bar)
+     * @param array  $options See {@link Html::progressBar()} for available options (excluding message)
      *
-     * @return void
+     * @return string|void
      **/
-    public static function createProgressBar($msg = "&nbsp;")
+    public static function createProgressBar($msg = "&nbsp;", array $options = [])
     {
-
-        $options = ['create' => true];
-        if ($msg != "&nbsp;") {
+        $options = array_replace([
+            'create' => true,
+            'display' => true
+        ], $options);
+        if ($msg !== "&nbsp;") {
             $options['message'] = $msg;
         }
 
+        if (!$options['display']) {
+            return self::progressBar('doaction_progress', $options);
+        }
         self::progressBar('doaction_progress', $options);
     }
 

diff --git a/src/Software.php b/src/Software.php
@@ -980,7 +980,7 @@ public function merge($item, $html = true)
         if ($html) {
             $twig_params = [
                 'merge_msg' => __('Merging'),
-                'progress' => Html::createProgressBar(__('Work in progress...'))
+                'progress' => Html::createProgressBar(__('Work in progress...'), ['display' => false])
             ];
             // language=Twig
             echo TemplateRenderer::getInstance()->renderFromStringTemplate(<<<TWIG