From 98176e5a075826b4322ba34987394ad18e2a722f Mon Sep 17 00:00:00 2001 From: Johan Cwiklinski Date: Mon, 9 Dec 2024 14:55:27 +0100 Subject: [PATCH] Fix devices transfer (#18509) --- src/Transfer.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/Transfer.php b/src/Transfer.php index 5f16b142e32..73fc434b770 100644 --- a/src/Transfer.php +++ b/src/Transfer.php @@ -4181,11 +4181,12 @@ public function showTransferList() continue; } $table = $itemtype::getTable(); - + $name_field = $item->getNameField(); + $table_name_field = sprintf('%1$s.%2$s', $table, $name_field); $iterator = $DB->request([ 'SELECT' => [ "$table.id", - "$table.name", + $table_name_field, 'entities.completename AS locname', 'entities.id AS entID' ], @@ -4199,7 +4200,7 @@ public function showTransferList() ] ], 'WHERE' => ["$table.id" => $tab], - 'ORDERBY' => ['locname', "$table.name"] + 'ORDERBY' => ['locname', $table_name_field] ]); $entID = -1; @@ -4213,7 +4214,7 @@ public function showTransferList() $entID = $data['entID']; echo "" . $data['locname'] . "
"; } - echo ($data['name'] ? $data['name'] : "(" . $data['id'] . ")") . "
"; + echo ($data[$name_field] ? $data[$name_field] : "(" . $data['id'] . ")") . "
"; } } }