From 84adf2b6fb7ff5ae7473911e842da0d64845c457 Mon Sep 17 00:00:00 2001 From: Thorsten Bus Date: Mon, 4 May 2026 06:41:05 +0200 Subject: [PATCH] fix: add hidden-label warning badge, use null color fallback in ProImportService --- app/Services/ProImportService.php | 2 +- resources/js/Pages/Settings/MacroAssignments.vue | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/app/Services/ProImportService.php b/app/Services/ProImportService.php index 390d2b1..645a03b 100644 --- a/app/Services/ProImportService.php +++ b/app/Services/ProImportService.php @@ -117,7 +117,7 @@ private function upsertSong(ProSong $proSong): Song if ($existingLabel === null) { $color = $proGroup->getColor(); - $hexColor = MacroColorConverter::fromRgba($color) ?? '#808080'; + $hexColor = MacroColorConverter::fromRgba($color); $existingLabel = Label::create([ 'name' => $groupName, diff --git a/resources/js/Pages/Settings/MacroAssignments.vue b/resources/js/Pages/Settings/MacroAssignments.vue index b93802a..d0901d6 100644 --- a/resources/js/Pages/Settings/MacroAssignments.vue +++ b/resources/js/Pages/Settings/MacroAssignments.vue @@ -121,6 +121,13 @@ function positionLabel(pos) { > → {{ a.label.name }} + + ⚠ Label deaktiviert +