DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-28 06:59:41 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop'

Browse source
This commit is contained in:
snipe 2022-07-11 16:26:14 -07:00
parent 8d3c9e67a0 d6ba8655bb
commit 3182f251e1
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
resources/views/licenses/view.blade.php
View file

@ -503,7 +503,7 @@
</td> </td>
<td>{{ $file->created_at }}</td> <td>{{ $file->created_at }}</td>
<td> <td>
<a class="btn delete-asset btn-danger btn-sm" href="{{ route('delete/licensefile', [$license->id, $file->id]) }}" data-content="{{ trans('general.delete_confirm', array('item' => $file)) }}" data-title="{{ trans('general.delete') }} {{ $file->filename }}?"> <a class="btn delete-asset btn-danger btn-sm" href="{{ route('delete/licensefile', [$license->id, $file->id]) }}" data-content="{{ trans('general.delete_confirm', ['item' => $file->filename]) }}" data-title="{{ trans('general.delete') }}">
<i class="fas fa-trash icon-white" aria-hidden="true"></i> <i class="fas fa-trash icon-white" aria-hidden="true"></i>
<span class="sr-only">{{ trans('general.delete') }}</span> <span class="sr-only">{{ trans('general.delete') }}</span>
</a> </a>
@ -575,5 +575,4 @@
@section('moar_scripts') @section('moar_scripts')
@include ('partials.bootstrap-table') @include ('partials.bootstrap-table')
@stop @stop

2
resources/views/users/print.blade.php
View file

@ -86,7 +86,7 @@
<td> <td>
{{ $asset->last_checkout }}</td> {{ $asset->last_checkout }}</td>
<td> <td>
@if ($asset->assetlog->first()) @if (($asset->assetlog->first()) && ($asset->assetlog->first()->accept_signature!=''))
<img style="width:auto;height:100px;" src="{{ asset('/') }}display-sig/{{ $asset->assetlog->first()->accept_signature }}"> <img style="width:auto;height:100px;" src="{{ asset('/') }}display-sig/{{ $asset->assetlog->first()->accept_signature }}">
@endif @endif
</td> </td>