diff --git a/resources/macros/macros.php b/resources/macros/macros.php index 90c6b0805e..23634f146c 100644 --- a/resources/macros/macros.php +++ b/resources/macros/macros.php @@ -478,7 +478,7 @@ Form::macro('two_factor_options', function ($name = "two_factor_enabled", $selec ); - $select = ''; foreach ($formats as $format => $label) { $select .= ' '."\n"; } diff --git a/resources/views/account/requestable-assets.blade.php b/resources/views/account/requestable-assets.blade.php index 5f9ab1be81..9d6917787b 100644 --- a/resources/views/account/requestable-assets.blade.php +++ b/resources/views/account/requestable-assets.blade.php @@ -60,8 +60,7 @@ @foreach ($assets as $asset) -
- {{ csrf_field() }} + @if ($asset->getImageUrl()) @@ -96,13 +95,16 @@ {{ $asset->expected_checkin }} + + {{ csrf_field() }} @if ($asset->isRequestedBy(Auth::user())) {{Form::submit(trans('button.cancel'), ['class' => 'btn btn-danger btn-sm'])}} @else {{Form::submit(trans('button.request'), ['class' => 'btn btn-primary btn-sm'])}} @endif + - + @endforeach