lunax/snipe_it
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Merge branch 'develop'

Browse source
This commit is contained in:
snipe 2017-10-11 01:31:59 -07:00
commit c15c082fb4
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -432,7 +432,7 @@ class AssetsController extends Controller
// Get the dropdown of users and then pass it to the checkout view // Get the dropdown of users and then pass it to the checkout view
return view('hardware/checkout', compact('asset')) return view('hardware/checkout', compact('asset'))
->with('users_list', Helper::usersList()) ->with('users_list', Helper::usersList())
->with('assets_list', Helper::assetsList()) ->with('assets_list', Helper::detailedAssetList())
->with('locations_list', Helper::locationsList()); ->with('locations_list', Helper::locationsList());
} }