From 397e89cbed5ce95b0e2cb13735563552857f74f0 Mon Sep 17 00:00:00 2001
From: mikeroq <mikeroq@gmail.com>
Date: Sat, 9 Jul 2022 14:09:40 -0500
Subject: [PATCH 1/2] Fixes modal showing entire model data instead of just the
 name

---
 resources/views/licenses/view.blade.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/resources/views/licenses/view.blade.php b/resources/views/licenses/view.blade.php
index 6e9f7436a6..3f186f1bba 100755
--- a/resources/views/licenses/view.blade.php
+++ b/resources/views/licenses/view.blade.php
@@ -503,7 +503,7 @@
                 </td>
                 <td>{{ $file->created_at }}</td>
                 <td>
-                  <a class="btn delete-asset btn-danger btn-sm" href="{{ route('delete/licensefile', [$license->id, $file->id]) }}" data-content="{{ trans('general.delete_confirm', array('item' => $file)) }}" data-title="{{ trans('general.delete') }} {{ $file->filename }}?">
+                  <a class="btn delete-asset btn-danger btn-sm" href="{{ route('delete/licensefile', [$license->id, $file->id]) }}" data-content="{{ trans('general.delete_confirm', ['item' => $file->filename]) }}" data-title="{{ trans('general.delete') }}">
                     <i class="fas fa-trash icon-white" aria-hidden="true"></i>
                     <span class="sr-only">{{ trans('general.delete') }}</span>
                   </a>
@@ -575,5 +575,4 @@
 
 @section('moar_scripts')
   @include ('partials.bootstrap-table')
-@stop
-
+@stop
\ No newline at end of file

From 8114d017990324f0880b6b58d73f014dbaedded6 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Mon, 11 Jul 2022 14:46:45 -0700
Subject: [PATCH 2/2] Only show sig file if  there is a value for accepted sig

Signed-off-by: snipe <snipe@snipe.net>
---
 resources/views/users/print.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/users/print.blade.php b/resources/views/users/print.blade.php
index 1da8353f28..1c0b3196e9 100644
--- a/resources/views/users/print.blade.php
+++ b/resources/views/users/print.blade.php
@@ -86,7 +86,7 @@
                     <td>
                         {{ $asset->last_checkout }}</td>
                     <td>
-                        @if ($asset->assetlog->first())
+                        @if (($asset->assetlog->first()) && ($asset->assetlog->first()->accept_signature!=''))
                             <img style="width:auto;height:100px;" src="{{ asset('/') }}display-sig/{{ $asset->assetlog->first()->accept_signature }}">
                         @endif
                     </td>