DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-03-05 20:52:15 -08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Redirect to back on bad checkout

Browse source
This commit is contained in:
snipe 2017-11-27 21:19:50 -08:00
parent 804b49cefb
commit b6c258bb12
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/Http/Controllers/AssetsController.php
View file

@ -459,11 +459,13 @@ class AssetsController extends Controller
} }
$this->authorize('checkout', $asset); $this->authorize('checkout', $asset);
$admin = Auth::user(); $admin = Auth::user();
// This item is checked out to a location // This item is checked out to a location
if (request('checkout_to_type')=='location') { if (request('checkout_to_type')=='location') {
$target = Location::find(request('assigned_location')); $target = Location::find(request('assigned_location'));
$asset->location_id = ($target) ? $target->id : ''; $asset->location_id = ($target) ? $target->id : '';
} elseif (request('checkout_to_type')=='asset') { } elseif (request('checkout_to_type')=='asset') {
$target = Asset::where('id','!=',$assetId)->find(request('assigned_asset')); $target = Asset::where('id','!=',$assetId)->find(request('assigned_asset'));
$asset->location_id = $target->rtd_location_id; $asset->location_id = $target->rtd_location_id;
@ -471,16 +473,16 @@ class AssetsController extends Controller
if ($target->location_id!='') { if ($target->location_id!='') {
$asset->location_id = ($target) ? $target->location_id : ''; $asset->location_id = ($target) ? $target->location_id : '';
} }
} else {
} elseif (request('checkout_to_type')=='user') {
// Fetch the target and set the asset's new location_id // Fetch the target and set the asset's new location_id
$target = User::find(request('assigned_user')); $target = User::find(request('assigned_user'));
$asset->location_id = ($target) ? $target->location_id : ''; $asset->location_id = ($target) ? $target->location_id : '';
} }
// No valid target was found - error out // No valid target was found - error out
if (!$target) { if (!$target) {
return redirect()->to("hardware/$assetId/checkout")->with('error', trans('admin/hardware/message.checkout.error'))->withErrors($asset->getErrors()); return redirect()->back()->with('error', trans('admin/hardware/message.checkout.error'))->withErrors($asset->getErrors());
} }