Apply suggestions from code review

Co-authored-by: Cédric Anne <cedric.anne@gmail.com>
glpi-project · Apr 29, 2024 · 97a1b12 · 97a1b12
1 parent 2678828
commit 97a1b12
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/src/Html.php b/src/Html.php
@@ -941,15 +941,13 @@ public static function progressBar($id, array $options = [])
      *
      * @return string|void
      **/
-    public static function createProgressBar($msg = "&nbsp;", array $options = [])
+    public static function createProgressBar($msg = null, array $options = [])
     {
         $options = array_replace([
             'create' => true,
             'display' => true
         ], $options);
-        if ($msg !== "&nbsp;") {
-            $options['message'] = $msg;
-        }
+        $options['message'] = $msg;
 
         if (!$options['display']) {
             return self::progressBar('doaction_progress', $options);

diff --git a/src/Software.php b/src/Software.php
@@ -985,7 +985,7 @@ public function merge($item, $html = true)
             // language=Twig
             echo TemplateRenderer::getInstance()->renderFromStringTemplate(<<<TWIG
                 {% import 'components/form/fields_macros.html.twig' as fields %}
-                <div class='text-center'>
+                <div class="text-center">
                     {{ fields.htmlField('', progress, merge_msg) }}
                 </div>
 TWIG, $twig_params);

diff --git a/src/SoftwareVersion.php b/src/SoftwareVersion.php
@@ -133,9 +133,9 @@ public function showForm($ID, array $options = [])
                 {% if item.isNewItem() %}
                     <input type="hidden" name="softwares_id" value="{{ softwares_id }}">
                 {% endif %}
-                {{ fields.htmlField('', get_item_link('Software', softwares_id), 'Software'|itemtype_name(1)) }}
+                {{ fields.htmlField('', get_item_link('Software', softwares_id), 'Software'|itemtype_name()) }}
                 {{ parent() }}
-                {{ fields.dropdownField('OperatingSystem', 'operatingsystems_id', item.fields['operatingsystems_id'], 'OperatingSystem'|itemtype_name(1)) }}
+                {{ fields.dropdownField('OperatingSystem', 'operatingsystems_id', item.fields['operatingsystems_id'], 'OperatingSystem'|itemtype_name()) }}
             {% endblock %}
 TWIG, $twig_params);
         return true;
@@ -358,6 +358,7 @@ public static function showForSoftware(Software $soft)
             ],
             'formatters' => [
                 'version' => 'raw_html',
+                'comments' => 'raw_html',
             ],
             'footers' => [
                 ['', '', '', __('Total'), $tot, '']