Skip to content

Commit 7037096

Browse files
committed
Fixed missing email masking on manage seating page
1 parent 595f8c6 commit 7037096

File tree

2 files changed

+21
-4
lines changed

2 files changed

+21
-4
lines changed

app/Models/SeatingPlan.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ public function getData(): Collection
8181
'description' => $seat->description,
8282
'nickname' => $seat->ticket->user->nickname ?? null,
8383
'original_email' => $seat->ticket->original_email ?? null,
84+
'external_id' => $seat->ticket->external_id ?? null,
8485
'ticket' => $seat->ticket->type->name ?? null,
8586
'ticketId' => $seat->ticket->id ?? null,
8687
'clans' => $clans,

resources/views/admin/events/seats.blade.php

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,11 @@
1414

1515
@if ($currentTicket)
1616
<p>
17-
Choose a seat for <strong>{{ $currentTicket->user->nickname ?? $currentTicket->original_email }}</strong>.
17+
@can('admin')
18+
Choose a seat for <strong>{{ $currentTicket->user->nickname ?? $currentTicket->original_email }}</strong>.
19+
@else
20+
Choose a seat for <strong>{{ $currentTicket->user->nickname ?? $currentTicket->external_id }}</strong>.
21+
@endcan
1822
</p>
1923
@else
2024
<p>
@@ -27,7 +31,11 @@
2731
@if($currentTicket)
2832
<div class="card mb-4">
2933
<div class="card-body">
30-
<h3 class="card-title">{{ $currentTicket->user->nickname ?? $currentTicket->original_email }}</h3>
34+
@can('admin')
35+
<h3 class="card-title">{{ $currentTicket->user->nickname ?? $currentTicket->original_email }}</h3>
36+
@else
37+
<h3 class="card-title">{{ $currentTicket->user->nickname ?? $currentTicket->external_id }}</h3>
38+
@endcan
3139
@if($currentTicket->user && $currentTicket->user->clanMemberships)
3240
<p class="card-subtitle">
3341

@@ -86,7 +94,12 @@ class="btn btn-primary-outline ms-auto">
8694
@foreach($tickets as $ticket)
8795
<li class="my-1">
8896
<a href="{{ route('admin.events.seats', ['event' => $event, 'ticket_id' => $ticket->id]) }}">
89-
{{ $ticket->user->nickname ?? $ticket->original_email }}</a>
97+
@can('admin')
98+
{{ $ticket->user->nickname ?? $ticket->original_email }}
99+
@else
100+
{{ $ticket->user->nickname ?? $ticket->external_id }}
101+
@endcan
102+
</a>
90103
<span class="badge-list">
91104
@if ($ticket->user)
92105
@foreach($ticket->user->clanMemberships as $clanMember)
@@ -149,7 +162,10 @@ class="badge bg-muted text-muted-fg">{{ $clanMember->clan->name }}</span>
149162
}
150163
if ($seat->ticket) {
151164
$class = 'taken';
152-
$name = $seat->original_email;
165+
if(Request::user()->hasRole('admin'))
166+
$name = $seat->original_email;
167+
else
168+
$name = $seat->external_id;
153169
}
154170
if ($seat->nickname) {
155171
$name = $seat->nickname;

0 commit comments

Comments
 (0)