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

Merge remote-tracking branch 'origin/develop'

Browse source 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
This commit is contained in:
snipe 2024-07-20 00:31:08 +01:00
parent a98ad76c6a e9f9d3c259
commit daa550cc82
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
config/version.php
View file

@ -1,10 +1,10 @@
<?php
return array (
'app_version' => 'v7.0.9',
'full_app_version' => 'v7.0.9 - build 14371-g1a541ce22',
'build_version' => '14371',
'full_app_version' => 'v7.0.9 - build 14485-ga98ad76c6',
'build_version' => '14485',
'prerelease_version' => '',
'hash_version' => 'g1a541ce22',
'full_hash' => 'v7.0.9-119-g1a541ce22',
'hash_version' => 'ga98ad76c6',
'full_hash' => 'v7.0.9-112-ga98ad76c6',
'branch' => 'master',
);

4
resources/views/partials/forms/edit/image-upload.blade.php
View file

@ -1,6 +1,6 @@
<!-- Image stuff - kept in /resources/views/partials/forms/edit/image-upload.blade.php -->
<!-- Image Delete -->
@if (isset($item) && ($item->image) && ($item->image!=''))
@if (isset($item) && ($item->{($fieldname ?? 'image')}))
<div class="form-group{{ $errors->has('image_delete') ? ' has-error' : '' }}">
<div class="col-md-9 col-md-offset-3">
<label class="form-control">
@ -12,7 +12,7 @@
</div>
<div class="form-group">
<div class="col-md-9 col-md-offset-3">
<img src="{{ Storage::disk('public')->url($image_path.e($item->image)) }}" class="img-responsive">
<img src="{{ Storage::disk('public')->url($image_path.e($item->{($fieldname ?? 'image')})) }}" class="img-responsive">
{!! $errors->first('image_delete', '<span class="alert-msg">:message</span>') !!}
</div>
</div>