From 66a5a7d7a5c2e76dae6514d17bb31f7e6ba6f3c1 Mon Sep 17 00:00:00 2001 From: Jens Reinemann Date: Sun, 17 May 2026 18:47:28 +0200 Subject: [PATCH] fix: Admin-Inventarliste zeigt GUID wenn kein Name gesetzt --- .../main/kotlin/de/bollwerk/server/model/AuthModels.kt | 1 + .../bollwerk/server/repository/InventoryRepository.kt | 2 +- server/src/main/resources/static/admin/index.html | 10 +++++++--- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/server/src/main/kotlin/de/bollwerk/server/model/AuthModels.kt b/server/src/main/kotlin/de/bollwerk/server/model/AuthModels.kt index 8cdff1f..958bdd1 100644 --- a/server/src/main/kotlin/de/bollwerk/server/model/AuthModels.kt +++ b/server/src/main/kotlin/de/bollwerk/server/model/AuthModels.kt @@ -36,6 +36,7 @@ internal data class UpdatePasswordRequest(val password: String) @Serializable internal data class InventoryWithUsersDto( val inventoryId: String, + val inventoryName: String, val users: List ) diff --git a/server/src/main/kotlin/de/bollwerk/server/repository/InventoryRepository.kt b/server/src/main/kotlin/de/bollwerk/server/repository/InventoryRepository.kt index 2d254ed..544069e 100644 --- a/server/src/main/kotlin/de/bollwerk/server/repository/InventoryRepository.kt +++ b/server/src/main/kotlin/de/bollwerk/server/repository/InventoryRepository.kt @@ -130,7 +130,7 @@ internal class InventoryRepository { inventoryId = invId ) } - InventoryWithUsersDto(inventoryId = invId, users = users) + InventoryWithUsersDto(inventoryId = invId, inventoryName = invRow[Inventories.name], users = users) } } diff --git a/server/src/main/resources/static/admin/index.html b/server/src/main/resources/static/admin/index.html index 71deb61..8a696e4 100644 --- a/server/src/main/resources/static/admin/index.html +++ b/server/src/main/resources/static/admin/index.html @@ -480,15 +480,19 @@ } else { page.forEach(inv => { const tr = document.createElement('tr'); - const name = inv.inventoryName ? inv.inventoryName : '—'; + const hasName = inv.inventoryName && inv.inventoryName.trim(); const lastUpdFmt = inv.lastUpdated ? new Date(inv.lastUpdated).toLocaleDateString('de-DE') : '–'; const tdName = document.createElement('td'); - tdName.textContent = name; - if (inv.inventoryName) { + if (hasName) { + tdName.textContent = inv.inventoryName; const badge = document.createElement('span'); badge.className = 'inv-badge'; badge.title = inv.inventoryId; badge.textContent = inv.inventoryId.slice(0, 8) + '…'; badge.style.marginLeft = '6px'; tdName.appendChild(badge); + } else { + const badge = document.createElement('span'); badge.className = 'inv-badge'; badge.title = inv.inventoryId; + badge.textContent = inv.inventoryId; + tdName.appendChild(badge); } const tds = [tdName];