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

Merge upstream and fix changes.

Browse source
This commit is contained in:
Daniel Meltzer 2016-06-10 07:44:45 -05:00
parent 9c4c91063f
commit e9605891f3
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -297,9 +297,8 @@ class AssetsController extends Controller
* @return Redirect
*/
public function postEdit($assetId = null, AssetRequest $request)
public function postEdit(AssetRequest $request, $assetId = null)
{
exit;
// Check if the asset exists
if (!$asset = Asset::find($assetId)) {
// Redirect to the asset management page with error