mirror of
https://github.com/snipe/snipe-it.git
synced 2024-09-21 00:07:42 -07:00
64d649be7f
* Extract a handlesimages trait to centralize logic for parsing/storing images on upload in create/edit methods. * Use same image upload/layout in accessories as consum+components. * Monster: Cleanup/Refactor http controllers. This cleans up docblocks, pulls most non-crudy actions into their own controllers, and does general cleanup/logic refactoring. There /should/ be no functional changes, but we all know how should works.. Extract checkin/checkout functions to a separate controller for accessories. Move controllers to subdirectory. Cleanup AssetModelsController Extract component checkin/checkout Assorted cleanups/doc/formatting in controllers. Refactor LicenseController. Refactor UsersController Update viewassetscontroller. * Codacy cleanups * More codacy cleanups. Extract a LicenseCheckout Form request as well. * A bit more refactor/cleaning of the license checkout method. * Review Related Cleanups * Fix most of the item_not_found translations. In many cases, the string being generated did not even use the id parameter. Where it does, pass it as id instead of as a different value. * Remove some old $data arrays from when we manually sent emails from the controllers. This has been superseeded by the notification system (yay!) * Bugfix: Only log the checkin of an accessory if the checkin completes sucessfully.
58 lines
1.7 KiB
PHP
58 lines
1.7 KiB
PHP
<?php
|
|
namespace App\Http\Controllers;
|
|
|
|
use App\Exceptions\CheckoutNotAllowed;
|
|
use App\Models\Asset;
|
|
use App\Models\Location;
|
|
use App\Models\SnipeModel;
|
|
use App\Models\User;
|
|
|
|
trait CheckInOutRequest
|
|
{
|
|
/**
|
|
* Find target for checkout
|
|
* @return SnipeModel Target asset is being checked out to.
|
|
*/
|
|
protected function determineCheckoutTarget()
|
|
{
|
|
// This item is checked out to a location
|
|
switch(request('checkout_to_type'))
|
|
{
|
|
case 'location':
|
|
return Location::findOrFail(request('assigned_location'));
|
|
case 'asset':
|
|
return Asset::findOrFail(request('assigned_asset'));
|
|
case 'user':
|
|
return User::findOrFail(request('assigned_user'));
|
|
}
|
|
return null;
|
|
}
|
|
|
|
/**
|
|
* Update the location of the asset passed in.
|
|
* @param Asset $asset Asset being updated
|
|
* @param SnipeModel $target Target with location
|
|
* @return Asset Asset being updated
|
|
*/
|
|
protected function updateAssetLocation($asset, $target)
|
|
{
|
|
switch(request('checkout_to_type'))
|
|
{
|
|
case 'location':
|
|
$asset->location_id = $target->id;
|
|
break;
|
|
case 'asset':
|
|
$asset->location_id = $target->rtd_location_id;
|
|
// Override with the asset's location_id if it has one
|
|
if ($target->location_id!='') {
|
|
$asset->location_id = $target->location_id;
|
|
}
|
|
break;
|
|
case 'user':
|
|
$asset->location_id = $target->location_id;
|
|
break;
|
|
}
|
|
return $asset;
|
|
}
|
|
}
|