DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-10 07:34:06 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fixed a few asset API issues

Browse source
This commit is contained in:
snipe 2017-01-12 02:19:55 -08:00
parent 704ee59541
commit 15373d5f4a
1 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
app/Http/Controllers/Api/AssetsController.php
View file

@ -186,7 +186,7 @@ class AssetsController extends Controller
* @since [v4.0] * @since [v4.0]
* @return JsonResponse * @return JsonResponse
*/ */
public function show($id = null) public function show($id)
{ {
if ($asset = Asset::withTrashed()->find($id)) { if ($asset = Asset::withTrashed()->find($id)) {
@ -195,7 +195,7 @@ class AssetsController extends Controller
return $asset; return $asset;
} }
return response()->json(['error' => trans('admin/hardware/message.does_not_exist')], 404); return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/hardware/message.does_not_exist')), 404);
} }
@ -204,9 +204,9 @@ class AssetsController extends Controller
* Accepts a POST request to create a new asset * Accepts a POST request to create a new asset
* *
* @author [A. Gianotto] [<snipe@snipe.net>] * @author [A. Gianotto] [<snipe@snipe.net>]
* @param int $assetId * @param Request $request
* @since [v4.0] * @since [v4.0]
* @return Redirect * @return JsonResponse
*/ */
public function store(AssetRequest $request) public function store(AssetRequest $request)
{ {
@ -247,20 +247,21 @@ class AssetsController extends Controller
if ($asset->save()) { if ($asset->save()) {
$asset->logCreate(); $asset->logCreate();
if(request('assigned_user')) { if($request->get('assigned_user')) {
$target = User::find(request('assigned_user')); $target = User::find(request('assigned_user'));
} elseif(request('assigned_asset')) { } elseif($request->get('assigned_asset')) {
$target = Asset::find(request('assigned_asset')); $target = Asset::find(request('assigned_asset'));
} elseif(request('assigned_location')) { } elseif($request->get('assigned_location')) {
$target = Location::find(request('assigned_location')); $target = Location::find(request('assigned_location'));
} }
if ($target) { if (isset($target)) {
$asset->checkOut($target, Auth::user(), date('Y-m-d H:i:s'), '', 'Checked out on asset creation', e($request->get('name'))); $asset->checkOut($target, Auth::user(), date('Y-m-d H:i:s'), '', 'Checked out on asset creation', e($request->get('name')));
} }
return response()->json(['success' => trans('admin/hardware/message.create.success')]); return response()->json(Helper::formatStandardApiResponse('success', $asset->id, trans('admin/hardware/message.create.success')));
} }
return response()->json(['errors' => $asset->getErrors()], 500); return response()->json(Helper::formatStandardApiResponse('error', null, $asset->getErrors()), 500);
} }
@ -271,7 +272,7 @@ class AssetsController extends Controller
* @author [A. Gianotto] [<snipe@snipe.net>] * @author [A. Gianotto] [<snipe@snipe.net>]
* @param int $assetId * @param int $assetId
* @since [v4.0] * @since [v4.0]
* @return Redirect * @return JsonResponse
*/ */
public function destroy($id) public function destroy($id)
{ {