Skip to content

Commit d3220fa

Browse files
committed
Fixes double error display on login forms
1 parent 51c07bf commit d3220fa

File tree

2 files changed

+40
-32
lines changed

2 files changed

+40
-32
lines changed

resources/views/layouts/admin.blade.php

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -155,25 +155,29 @@
155155
<div class="col-md-9">
156156
<div class="row">
157157
<div class="col-md-12" id="tpl_messages">
158-
@if (count($errors) > 0)
159-
<div class="alert alert-danger">
160-
<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
161-
<strong>{{ trans('strings.whoops') }}!</strong> {{ trans('auth.errorencountered') }}<br><br>
162-
<ul>
163-
@foreach ($errors->all() as $error)
164-
<li>{{ $error }}</li>
165-
@endforeach
166-
</ul>
167-
</div>
168-
@endif
169-
@foreach (Alert::getMessages() as $type => $messages)
170-
@foreach ($messages as $message)
171-
<div class="alert alert-{{ $type }} alert-dismissable" role="alert">
158+
@section('resp-errors')
159+
@if (count($errors) > 0)
160+
<div class="alert alert-danger">
172161
<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
173-
{!! $message !!}
162+
<strong>{{ trans('strings.whoops') }}!</strong> {{ trans('auth.errorencountered') }}<br><br>
163+
<ul>
164+
@foreach ($errors->all() as $error)
165+
<li>{{ $error }}</li>
166+
@endforeach
167+
</ul>
174168
</div>
169+
@endif
170+
@show
171+
@section('resp-alerts')
172+
@foreach (Alert::getMessages() as $type => $messages)
173+
@foreach ($messages as $message)
174+
<div class="alert alert-{{ $type }} alert-dismissable" role="alert">
175+
<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
176+
{!! $message !!}
177+
</div>
178+
@endforeach
175179
@endforeach
176-
@endforeach
180+
@show
177181
</div>
178182
</div>
179183
<div class="row">

resources/views/layouts/master.blade.php

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -260,25 +260,29 @@
260260
<div class="col-md-9">
261261
<div class="row">
262262
<div class="col-md-12" id="tpl_messages">
263-
@if (count($errors) > 0)
264-
<div class="alert alert-danger">
265-
<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
266-
<strong>{{ trans('strings.whoops') }}!</strong> {{ trans('auth.errorencountered') }}<br><br>
267-
<ul>
268-
@foreach ($errors->all() as $error)
269-
<li>{{ $error }}</li>
270-
@endforeach
271-
</ul>
272-
</div>
273-
@endif
274-
@foreach (Alert::getMessages() as $type => $messages)
275-
@foreach ($messages as $message)
276-
<div class="alert alert-{{ $type }} alert-dismissable" role="alert">
263+
@section('resp-errors')
264+
@if (count($errors) > 0)
265+
<div class="alert alert-danger">
277266
<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
278-
{!! $message !!}
267+
<strong>{{ trans('strings.whoops') }}!</strong> {{ trans('auth.errorencountered') }}<br><br>
268+
<ul>
269+
@foreach ($errors->all() as $error)
270+
<li>{{ $error }}</li>
271+
@endforeach
272+
</ul>
279273
</div>
274+
@endif
275+
@show
276+
@section('resp-alerts')
277+
@foreach (Alert::getMessages() as $type => $messages)
278+
@foreach ($messages as $message)
279+
<div class="alert alert-{{ $type }} alert-dismissable" role="alert">
280+
<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
281+
{!! $message !!}
282+
</div>
283+
@endforeach
280284
@endforeach
281-
@endforeach
285+
@show
282286
</div>
283287
</div>
284288
<div class="row">

0 commit comments

Comments
 (0)