DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-09 23:24:06 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fixed #8747 - upload path for uploaded images

Browse source
This commit is contained in:
snipe 2020-11-16 16:39:02 -08:00
parent 6e4ab5cd96
commit fbaf6e2494
2 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/Http/Requests/ImageUploadRequest.php
View file

@ -49,8 +49,7 @@ class ImageUploadRequest extends Request
$type = strtolower(class_basename(get_class($item))); $type = strtolower(class_basename(get_class($item)));
if (is_null($path)) { if (is_null($path)) {
$path = 'uploads/'; $path = str_plural($type);
$path .= str_plural($type);
if ($type == 'assetmodel') { if ($type == 'assetmodel') {
$path = 'models'; $path = 'models';

14
resources/views/hardware/view.blade.php
View file

@ -729,16 +729,12 @@
<div class="col-md-4"> <div class="col-md-4">
@if ($asset->image) @if (($asset->image) || (($asset->model) && ($asset->model->image!='')))
<div class="col-md-12 text-center" style="padding-bottom: 15px;"> <div class="col-md-12 text-center" style="padding-bottom: 15px;">
<a href="{{ Storage::disk('public')->url('uploads/assets/'. $asset->image) }}" data-toggle="lightbox"> <a href="{{ ($asset->getImageUrl()) ? $asset->getImageUrl() : null }}" data-toggle="lightbox">
<img src="{{ Storage::disk('public')->url('uploads/assets/'. $asset->image) }}" class="assetimg img-responsive" alt="{{ $asset->getDisplayNameAttribute() }}"> <img src="{{ ($asset->getImageUrl()) ? $asset->getImageUrl() : null }}" class="assetimg img-responsive" alt="{{ $asset->getDisplayNameAttribute() }}">
</a>
</div>
@elseif (($asset->model) && ($asset->model->image!=''))
<div class="col-md-12 text-center" style="padding-bottom: 15px;">
<a href="{{ Storage::disk('public')->url('uploads/models/'.$asset->model->image) }}" data-toggle="lightbox">
<img src="{{ Storage::disk('public')->url('uploads/models/'.$asset->model->image) }}" class="assetimg img-responsive" alt="{{ $asset->getDisplayNameAttribute() }}">
</a> </a>
</div> </div>
@endif @endif