Skip to content

Commit

Permalink
fix: missing null check on typeName (#673)
Browse files Browse the repository at this point in the history
  • Loading branch information
recursivetree authored Apr 2, 2024
1 parent 27a4a9e commit 230f317
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/resources/views/character/sheet.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<dt>{{ trans('web::seat.curr_training') }}</dt>
<dd>
@if($character->skill_queue->where('finish_date', '>', carbon())->isNotEmpty())
{{ $character->skill_queue->where('finish_date', '>', carbon())->first()->type->typeName }} to level
{{ $character->skill_queue->where('finish_date', '>', carbon())->first()->type->typeName ?? trans('web::seat.unknown') }} to level
<b>{{ $character->skill_queue->where('finish_date', '>', carbon())->first()->finished_level }}</b>
@else
{{ trans('web::seat.no_skill_training') }}
Expand Down Expand Up @@ -60,7 +60,7 @@
<span class="col-md-8" data-toggle="tooltip" title=""
@if($skill->finish_date != '0000-00-00 00:00:00')
data-original-title="Ends {{ human_diff(carbon($skill->finish_date)->toDateString()) }} on {{ carbon($skill->finish_date)->toDateString() }} at {{ carbon($skill->finish_date)->toTimeString() }}"
@endif>{{ $skill->type->typeName }}</span>
@endif>{{ $skill->type->typeName ?? trans('web::seat.unknown') }}</span>
<span class="col-md-4">
@for($i = 1; $i <= $skill->finished_level; $i++)
@if($i == $skill->finished_level)
Expand Down Expand Up @@ -267,7 +267,7 @@
<ul>

@foreach($character->implants as $implant)
<li>{{ $implant->type->typeName }}</li>
<li>{{ $implant->type->typeName ?? trans('web::seat.unknown') }}</li>
@endforeach

</ul>
Expand Down

0 comments on commit 230f317

Please sign in to comment.