From bd0498aa69c26bcfbd48551004f62c891332294c Mon Sep 17 00:00:00 2001 From: snipe Date: Wed, 27 Sep 2017 12:58:08 -0700 Subject: [PATCH] Fixes #4016 - signature file missing from history tab --- app/Http/Transformers/ActionlogsTransformer.php | 1 + resources/views/hardware/view.blade.php | 3 +++ resources/views/partials/bootstrap-table.blade.php | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/Http/Transformers/ActionlogsTransformer.php b/app/Http/Transformers/ActionlogsTransformer.php index 6b81ce33c1..692ea5eecd 100644 --- a/app/Http/Transformers/ActionlogsTransformer.php +++ b/app/Http/Transformers/ActionlogsTransformer.php @@ -53,6 +53,7 @@ class ActionlogsTransformer ] : null, 'note' => e($actionlog->note), + 'signature_file' => ($actionlog->accept_signature) ? $actionlog->accept_signature : null, ]; diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php index fcf2c85529..2e86178189 100755 --- a/resources/views/hardware/view.blade.php +++ b/resources/views/hardware/view.blade.php @@ -603,6 +603,9 @@ {{ trans('general.item') }} {{ trans('general.target') }} {{ trans('general.notes') }} + @if ($snipeSettings->require_accept_signature=='1') + {{ trans('general.signature') }} + @endif diff --git a/resources/views/partials/bootstrap-table.blade.php b/resources/views/partials/bootstrap-table.blade.php index e579c666ca..672dd39f96 100644 --- a/resources/views/partials/bootstrap-table.blade.php +++ b/resources/views/partials/bootstrap-table.blade.php @@ -358,7 +358,7 @@ $('.snipe-table').bootstrapTable({ function imageFormatter(value, row) { if (value) { - return ''; + return ''; } }