mirror of
https://github.com/snipe/snipe-it.git
synced 2024-11-10 07:34:06 -08:00
Merge branch 'develop'
This commit is contained in:
commit
38326314ca
|
@ -82,7 +82,7 @@ class AssetModelsController extends Controller
|
||||||
$model->manufacturer_id = $request->input('manufacturer_id');
|
$model->manufacturer_id = $request->input('manufacturer_id');
|
||||||
$model->category_id = $request->input('category_id');
|
$model->category_id = $request->input('category_id');
|
||||||
$model->notes = $request->input('notes');
|
$model->notes = $request->input('notes');
|
||||||
$model->user_id = Auth::guard('api')->user();
|
$model->user_id = Auth::id();
|
||||||
$model->requestable = Input::has('requestable');
|
$model->requestable = Input::has('requestable');
|
||||||
|
|
||||||
if ($request->input('custom_fieldset')!='') {
|
if ($request->input('custom_fieldset')!='') {
|
||||||
|
|
Loading…
Reference in a new issue