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 1 Packages Projects Releases Wiki Activity

Set the location_id on save/update to rtd if one is given

Browse source
This commit is contained in:
snipe 2017-11-03 19:41:26 -07:00
parent 8c1f4b006e
commit 5b489e003d
1 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -160,6 +160,10 @@ class AssetsController extends Controller
$asset->requestable = request('requestable', 0); $asset->requestable = request('requestable', 0);
$asset->rtd_location_id = request('rtd_location_id', null); $asset->rtd_location_id = request('rtd_location_id', null);
if ($asset->assigned_to=='') {
$asset->location_id = $request->input('rtd_location_id', null);
}
// Create the image (if one was chosen.) // Create the image (if one was chosen.)
if ($request->has('image')) { if ($request->has('image')) {
$image = $request->input('image'); $image = $request->input('image');
@ -216,15 +220,20 @@ class AssetsController extends Controller
// Was the asset created? // Was the asset created?
if ($asset->save()) { if ($asset->save()) {
$asset->logCreate(); $asset->logCreate();
if (request('assigned_user')) { if (request('assigned_user')) {
$target = User::find(request('assigned_user')); $target = User::find(request('assigned_user'));
$location = $target->location_id;
} elseif (request('assigned_asset')) { } elseif (request('assigned_asset')) {
$target = Asset::find(request('assigned_asset')); $target = Asset::find(request('assigned_asset'));
$location = $target->location_id;
} elseif (request('assigned_location')) { } elseif (request('assigned_location')) {
$target = Location::find(request('assigned_location')); $target = Location::find(request('assigned_location'));
$location = $target->id;
} }
if (isset($target)) { if (isset($target)) {
$asset->checkOut($target, Auth::user(), date('Y-m-d H:i:s'), '', 'Checked out on asset creation', e(Input::get('name'))); $asset->checkOut($target, Auth::user(), date('Y-m-d H:i:s'), '', 'Checked out on asset creation', e(Input::get('name')), $location);
} }
// Redirect to the asset listing page // Redirect to the asset listing page
\Session::flash('success', trans('admin/hardware/message.create.success')); \Session::flash('success', trans('admin/hardware/message.create.success'));
@ -549,6 +558,8 @@ class AssetsController extends Controller
$asset->status_id = e(Input::get('status_id')); $asset->status_id = e(Input::get('status_id'));
} }
$asset->location_id = $asset->rtd_location_id;
if (Input::has('location_id')) { if (Input::has('location_id')) {
$asset->location_id = e(Input::get('location_id')); $asset->location_id = e(Input::get('location_id'));
} }