DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-01-11 05:47:28 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #2187 from dmeltzer/fix-asset-creation

Browse source 
Fix asset creation errors when asset tag already exists
This commit is contained in:
snipe 2016-06-22 11:31:48 -07:00 committed by GitHub
parent dd1241f964 b9f72a2afa
commit 71b82fee03
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -254,8 +254,8 @@ class AssetsController extends Controller
\Session::flash('success', trans('admin/hardware/message.create.success')); \Session::flash('success', trans('admin/hardware/message.create.success'));
return response()->json(['redirect_url' => route('hardware')]); return response()->json(['redirect_url' => route('hardware')]);
} }
\Session::flash('errors', $asset->getErrors());
return response()->json(['errors' => $asset->getErrors()]); return response()->json(['errors' => $asset->getErrors()], 500);
} }
/** /**
@ -417,8 +417,8 @@ class AssetsController extends Controller
\Session::flash('success', trans('admin/hardware/message.update.success')); \Session::flash('success', trans('admin/hardware/message.update.success'));
return response()->json(['redirect_url' => route("view/hardware", $assetId)]); return response()->json(['redirect_url' => route("view/hardware", $assetId)]);
} }
\Session::flash('errors', $asset->getErrors());
return response()->json(['errors' => $asset->getErrors()]); return response()->json(['errors' => $asset->getErrors()], 500);
} }