Fixed image path to show preview

Signed-off-by: snipe <snipe@snipe.net>
This commit is contained in:
snipe 2022-11-03 13:51:48 -07:00
parent 6d5ace0458
commit 7cb1ca8754
4 changed files with 12 additions and 12 deletions

View file

@ -72,7 +72,7 @@
</li> </li>
@can('accessorys.files', $accessory) @can('accessories.files', $accessory)
<li> <li>
<a href="#files" data-toggle="tab"> <a href="#files" data-toggle="tab">
<span class="hidden-lg hidden-md"> <span class="hidden-lg hidden-md">
@ -176,7 +176,7 @@
@can('accessorys.files', $accessory) @can('accessories.files', $accessory)
<div class="tab-pane" id="files"> <div class="tab-pane" id="files">
<div class="table table-responsive"> <div class="table table-responsive">
@ -198,7 +198,7 @@
data-sort-name="name" data-sort-name="name"
class="table table-striped snipe-table" class="table table-striped snipe-table"
data-export-options='{ data-export-options='{
"fileName": "export-accessorys-uploads-{{ str_slug($accessory->name) }}-{{ date('Y-m-d') }}", "fileName": "export-accessories-uploads-{{ str_slug($accessory->name) }}-{{ date('Y-m-d') }}",
"ignoreColumn": ["actions","image","change","checkbox","checkincheckout","delete","download","icon"] "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","delete","download","icon"]
}'> }'>
<thead> <thead>
@ -224,7 +224,7 @@
</td> </td>
<td> <td>
@if ($file->filename) @if ($file->filename)
@if ( Helper::checkUploadIsImage($file->get_src('accessorys'))) @if ( Helper::checkUploadIsImage($file->get_src('accessories')))
<a href="{{ route('show.accessoryfile', ['accessoryId' => $accessory->id, 'fileId' => $file->id, 'download' => 'false']) }}" data-toggle="lightbox" data-type="image"><img src="{{ route('show.accessoryfile', ['accessoryId' => $accessory->id, 'fileId' => $file->id]) }}" class="img-thumbnail" style="max-width: 50px;"></a> <a href="{{ route('show.accessoryfile', ['accessoryId' => $accessory->id, 'fileId' => $file->id, 'download' => 'false']) }}" data-toggle="lightbox" data-type="image"><img src="{{ route('show.accessoryfile', ['accessoryId' => $accessory->id, 'fileId' => $file->id]) }}" class="img-thumbnail" style="max-width: 50px;"></a>
@endif @endif
@endif @endif
@ -232,8 +232,8 @@
<td> <td>
{{ $file->filename }} {{ $file->filename }}
</td> </td>
<td data-value="{{ (Storage::exists('private_uploads/accessorys/'.$file->filename) ? Storage::size('private_uploads/accessorys/'.$file->filename) : '') }}"> <td data-value="{{ (Storage::exists('private_uploads/accessories/'.$file->filename) ? Storage::size('private_uploads/accessories/'.$file->filename) : '') }}">
{{ @Helper::formatFilesizeUnits(Storage::exists('private_uploads/accessorys/'.$file->filename) ? Storage::size('private_uploads/accessorys/'.$file->filename) : '') }} {{ @Helper::formatFilesizeUnits(Storage::exists('private_uploads/accessories/'.$file->filename) ? Storage::size('private_uploads/accessories/'.$file->filename) : '') }}
</td> </td>
<td> <td>
@ -392,7 +392,7 @@
@can('update', Accessory::class) @can('accessories.files', Accessory::class)
@include ('modals.upload-file', ['item_type' => 'accessory', 'item_id' => $accessory->id]) @include ('modals.upload-file', ['item_type' => 'accessory', 'item_id' => $accessory->id])
@endcan @endcan
@stop @stop

View file

@ -283,7 +283,7 @@
</div> </div>
</div> <!-- .row--> </div> <!-- .row-->
@can('update', Component::class) @can('components.files', Component::class)
@include ('modals.upload-file', ['item_type' => 'component', 'item_id' => $component->id]) @include ('modals.upload-file', ['item_type' => 'component', 'item_id' => $component->id])
@endcan @endcan
@stop @stop

View file

@ -288,7 +288,7 @@
@can('update', \App\Models\Consumable::class) @can('consumables.files', \App\Models\Consumable::class)
@include ('modals.upload-file', ['item_type' => 'consumable', 'item_id' => $consumable->id]) @include ('modals.upload-file', ['item_type' => 'consumable', 'item_id' => $consumable->id])
@endcan @endcan
@stop @stop

View file

@ -145,9 +145,9 @@
<tr> <tr>
<td><i class="{{ Helper::filetype_icon($file->filename) }} icon-med" aria-hidden="true"></i></td> <td><i class="{{ Helper::filetype_icon($file->filename) }} icon-med" aria-hidden="true"></i></td>
<td> <td>
@if ( Helper::checkUploadIsImage($file->get_src('assets'))) @if ( Helper::checkUploadIsImage($file->get_src('assetmodels')))
<a href="{{ route('show/modelFile', ['modelId' => $model->id, 'fileId' =>$file->id]) }}" data-toggle="lightbox" data-type="image" data-title="{{ $file->filename }}" data-footer="{{ Helper::getFormattedDateObject($asset->last_checkout, 'datetime', false) }}"> <a href="{{ route('show/modelfile', ['modelID' => $model->id, 'fileId' => $file->id]) }}" data-toggle="lightbox" data-type="image" data-title="{{ $file->filename }}">
<img src="{{ route('show/modelfile', ['assetId' => $model->id, 'fileId' =>$file->id]) }}" style="max-width: 50px;"> <img src="{{ route('show/modelfile', ['modelID' => $model->id, 'fileId' =>$file->id]) }}" style="max-width: 50px;">
</a> </a>
@endif @endif
</td> </td>