From bd376a4992710fbf2f75b79953cf2d53ebefcf1c Mon Sep 17 00:00:00 2001 From: snipe Date: Wed, 18 Oct 2017 07:02:18 -0700 Subject: [PATCH 1/2] Possible fix for #4227 --- resources/views/licenses/view.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/licenses/view.blade.php b/resources/views/licenses/view.blade.php index 3ab78b27a..11a21ebf6 100755 --- a/resources/views/licenses/view.blade.php +++ b/resources/views/licenses/view.blade.php @@ -76,7 +76,7 @@ @endif - @if ($licensedto->asset_id) + @if ($licensedto->asset) @can('view', $licensedto->asset) {{ $licensedto->asset->name }} {{ $licensedto->asset->asset_tag }} From 68f6385ebaf90b9522b60a7543a393c5b1d2b0d1 Mon Sep 17 00:00:00 2001 From: snipe Date: Wed, 18 Oct 2017 07:15:16 -0700 Subject: [PATCH 2/2] Fixes 500 in bulk checkout if no asset is selected --- app/Http/Controllers/AssetsController.php | 3 +++ resources/lang/en/admin/hardware/message.php | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/AssetsController.php b/app/Http/Controllers/AssetsController.php index dd9d0c7fa..5003ae924 100755 --- a/app/Http/Controllers/AssetsController.php +++ b/app/Http/Controllers/AssetsController.php @@ -1179,6 +1179,9 @@ class AssetsController extends Controller $user = User::find(e(Input::get('assigned_to'))); $admin = Auth::user(); + if (!is_array(Input::get('selected_assets'))) { + return redirect()->route('hardware/bulkcheckout')->withInput()->with('error', trans('admin/hardware/message.checkout.no_assets_selected')); + } $asset_ids = array_filter(Input::get('selected_assets')); if ((Input::has('checkout_at')) && (Input::get('checkout_at')!= date("Y-m-d"))) { diff --git a/resources/lang/en/admin/hardware/message.php b/resources/lang/en/admin/hardware/message.php index 112cf77de..e087cad26 100644 --- a/resources/lang/en/admin/hardware/message.php +++ b/resources/lang/en/admin/hardware/message.php @@ -62,7 +62,8 @@ return array( 'error' => 'Asset was not checked out, please try again', 'success' => 'Asset checked out successfully.', 'user_does_not_exist' => 'That user is invalid. Please try again.', - 'not_available' => 'That asset is not available for checkout!' + 'not_available' => 'That asset is not available for checkout!', + 'no_assets_selected' => 'You must select at least one asset from the list' ), 'checkin' => array(