DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-09-20 07:47:41 -07:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

Merge pull request #13159 from Godmartinz/audit_image_bug

Browse source 
fixed audit log image not appearing
This commit is contained in:
snipe 2023-06-22 21:11:39 +01:00 committed by GitHub
parent 17a10a4342 6dd7181d09
commit 4029efebfd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/Presenters/AssetAuditPresenter.php
View file

@ -44,13 +44,13 @@ class AssetAuditPresenter extends Presenter
'visible' => true,
'formatter' => 'hardwareLinkFormatter',
], [
'field' => 'image',
'field' => 'file',
'searchable' => false,
'sortable' => true,
'switchable' => true,
'title' => trans('admin/hardware/table.image'),
'visible' => false,
'formatter' => 'imageFormatter',
'formatter' => 'auditImageFormatter',
], [
'field' => 'asset_tag',
'searchable' => true,

8
resources/views/partials/bootstrap-table.blade.php
View file

@ -652,11 +652,15 @@
}
}
function auditImageFormatter(value){
if (value){
return '<a href="' + value.url + '" data-toggle="lightbox" data-type="image"><img src="' + value.url + '" style="max-height: {{ $snipeSettings->thumbnail_max_h }}px; width: auto;" class="img-responsive"></a>'
}
}
function imageFormatter(value, row) {
if (value) {
// This is a clunky override to handle unusual API responses where we're presenting a link instead of an array

2
resources/views/reports/audit.blade.php
View file

@ -34,7 +34,7 @@
<thead>
<tr>
<th class="col-sm-1" data-field="image" data-visible="false" data-formatter="imageFormatter">{{ trans('admin/hardware/table.image') }}</th>
<th class="col-sm-1" data-field="file" data-visible="false" data-formatter="auditImageFormatter">{{ trans('admin/hardware/table.image') }}</th>
<th class="col-sm-2" data-field="created_at" data-formatter="dateDisplayFormatter">{{ trans('general.audit') }}</th>
<th class="col-sm-2" data-field="admin" data-formatter="usersLinkObjFormatter">{{ trans('general.admin') }}</th>
<th class="col-sm-2" data-field="item" data-formatter="polymorphicItemFormatter">{{ trans('general.item') }}</th>