public/pp-planer
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

fix: add hidden-label warning badge, use null color fallback in ProImportService

Browse source
This commit is contained in:
Thorsten Bus 2026-05-04 06:41:05 +02:00
parent 41d4bfe2b7
commit 84adf2b6fb
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Services/ProImportService.php
View file

@ -117,7 +117,7 @@ private function upsertSong(ProSong $proSong): Song
if ($existingLabel === null) { if ($existingLabel === null) {
$color = $proGroup->getColor(); $color = $proGroup->getColor();
$hexColor = MacroColorConverter::fromRgba($color) ?? '#808080'; $hexColor = MacroColorConverter::fromRgba($color);
$existingLabel = Label::create([ $existingLabel = Label::create([
'name' => $groupName, 'name' => $groupName,

7
resources/js/Pages/Settings/MacroAssignments.vue
View file

@ -121,6 +121,13 @@ function positionLabel(pos) {
> >
→ {{ a.label.name }} → {{ a.label.name }}
</span> </span>
<span
v-if="a.position === 'by_label' && a.label?.hidden_at"
class="rounded bg-red-100 px-1.5 py-0.5 text-xs text-red-700"
data-testid="warning-hidden-label"
>
⚠ Label deaktiviert
</span>
<span <span
v-if="a.macro?.hidden_at" v-if="a.macro?.hidden_at"
class="rounded bg-amber-100 px-1.5 py-0.5 text-xs text-amber-700" class="rounded bg-amber-100 px-1.5 py-0.5 text-xs text-amber-700"