FGFS-4.1/phpvms
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Check if flash messages are strings

Browse Source
This commit is contained in:
Nabeel Shahzad
2021-04-01 17:31:53 -04:00
parent ede71e6927
commit 677d30883f
2 changed files with 45 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
resources/views/admin/flash/message.blade.php
View File

@@ -1,26 +1,30 @@
@foreach (session('flash_notification', collect()) as $message) @foreach (session('flash_notification', collect()) as $message)
@if ($message['overlay']) @if (is_string($message))
@include('flash::modal', [ <div class="alert alert-error">{!! $message !!}</div>
'modalClass' => 'flash-modal',
'title' => $message['title'],
'body' => $message['message']
])
@else @else
<div class="alert @if ($message['overlay'])
alert-{{ $message['level'] }} @include('flash::modal', [
{{ $message['important'] ? 'alert-important' : '' }}" 'modalClass' => 'flash-modal',
role="alert"> 'title' => $message['title'],
@if ($message['important']) 'body' => $message['message']
<button type="button" ])
class="close" @else
data-dismiss="alert" <div class="alert
aria-hidden="true" alert-{{ $message['level'] }}
>&times; {{ $message['important'] ? 'alert-important' : '' }}"
</button> role="alert">
@endif @if ($message['important'])
<button type="button"
class="close"
data-dismiss="alert"
aria-hidden="true"
>&times;
</button>
@endif
{!! $message['message'] !!} {!! $message['message'] !!}
</div> </div>
@endif
@endif @endif
@endforeach @endforeach

41
resources/views/layouts/default/flash/message.blade.php
View File

@@ -1,26 +1,27 @@
@foreach (collect(session('flash_notification', collect()))->toArray() as $message) @foreach (collect(session('flash_notification', collect()))->toArray() as $message)
@if ($message['overlay']) @if (is_string($message))
@include('flash::modal', [ <div class="alert alert-error">{!! $message !!}</div>
'modalClass' => 'flash-modal',
'title' => $message['title'],
'body' => $message['message']
])
@else @else
<div class="alert @if ($message['overlay'])
alert-{{ $message['level'] }} @include('flash::modal', [
{{ $message['important'] ? 'alert-important' : '' }}" 'modalClass' => 'flash-modal',
role="alert"> 'title' => $message['title'],
@if ($message['important']) 'body' => $message['message']
<button type="button" ])
class="close" @else
data-dismiss="alert" <div class="alert alert-{{ $message['level'] }}
aria-hidden="true" {{ $message['important'] ? 'alert-important' : '' }}"
>&times; role="alert">
</button> @if ($message['important'])
@endif <button type="button"
class="close"
data-dismiss="alert"
aria-hidden="true">&times;</button>
@endif
{!! $message['message'] !!} {!! $message['message'] !!}
</div> </div>
@endif
@endif @endif
@endforeach @endforeach