lunax/snipe_it
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Merge pull request #13281 from inietov/fixes/error_showing_requested_assets

Browse source 
Fixed #13276 Error Showing Requested Assets
This commit is contained in:
snipe 2023-07-11 11:11:33 +01:00 • committed by GitHub
commit a5555a1c67
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Models/CheckoutRequest.php
View file

@ -18,7 +18,7 @@ class CheckoutRequest extends Model
public function requestingUser() public function requestingUser()
{ {
return $this->user()->first(); return $this->user()->withTrashed()->first();
} }
public function requestedItem() public function requestedItem()

2
resources/views/hardware/requested.blade.php
View file

@ -89,7 +89,7 @@
@endif @endif
</td> </td>
<td> <td>
@if ($request->requestingUser()) @if ($request->requestingUser() && !$request->requestingUser()->trashed())
<a href="{{ config('app.url') }}/users/{{ $request->requestingUser()->id }}"> <a href="{{ config('app.url') }}/users/{{ $request->requestingUser()->id }}">
{{ $request->requestingUser()->present()->fullName() }} {{ $request->requestingUser()->present()->fullName() }}
</a> </a>