fix(licence): user name display

glpi-project · Jan 21, 2025 · 99babf8 · 99babf8
1 parent 46d57da
commit 99babf8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/Item_SoftwareLicense.php b/src/Item_SoftwareLicense.php
@@ -783,7 +783,7 @@ function updateItemDropdown(itemtype_el) {
                 'glpi_softwarelicenses.name AS license',
                 'glpi_softwarelicenses.id AS vID',
                 'glpi_softwarelicenses.softwares_id AS softid',
-                "$users_table.name AS itemname",
+                User::getFriendlyNameFields('itemname'),
                 "$users_table.id AS iID",
                 new QueryExpression($DB::quoteValue(User::class), 'item_type'),
                 new QueryExpression($DB::quoteValue(''), "serial"),

diff --git a/src/User.php b/src/User.php
@@ -6735,8 +6735,8 @@ public static function getFriendlyNameFields(string $alias = "name")
         $table  = self::getTable();
         return QueryFunction::if(
             condition: [
-                "$table.$first" => ['<>' => ''],
-                "$table.$second" => ['<>' => '']
+                "$table.$first" => ['<>', ''],
+                "$table.$second" => ['<>', '']
             ],
             true_expression: QueryFunction::concat(["$table.$first", new QueryExpression($DB::quoteValue(' ')), "$table.$second"]),
             false_expression: $table . '.' . self::getNameField(),