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

Merge pull request #12726 from snipe/fixes/12724_custom_fields

Browse source 
Fixed #12724 - fieldset not saving on model
This commit is contained in:
snipe 2023-03-24 06:17:42 -07:00 • committed by GitHub
commit aa4bdd4eb3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/Http/Controllers/AssetModelsController.php
View file

@ -82,8 +82,8 @@ class AssetModelsController extends Controller
$model->user_id = Auth::id(); $model->user_id = Auth::id();
$model->requestable = Request::has('requestable'); $model->requestable = Request::has('requestable');
if ($request->input('custom_fieldset') != '') { if ($request->input('fieldset_id') != '') {
$model->fieldset_id = e($request->input('custom_fieldset')); $model->fieldset_id = e($request->input('fieldset_id'));
} }
$model = $request->handleImages($model); $model = $request->handleImages($model);
@ -160,10 +160,10 @@ class AssetModelsController extends Controller
$this->removeCustomFieldsDefaultValues($model); $this->removeCustomFieldsDefaultValues($model);
if ($request->input('custom_fieldset') == '') { if ($request->input('fieldset_id') == '') {
$model->fieldset_id = null; $model->fieldset_id = null;
} else { } else {
$model->fieldset_id = $request->input('custom_fieldset'); $model->fieldset_id = $request->input('fieldset_id');
if ($this->shouldAddDefaultValues($request->input())) { if ($this->shouldAddDefaultValues($request->input())) {
if (!$this->assignCustomFieldsDefaultValues($model, $request->input('default_values'))){ if (!$this->assignCustomFieldsDefaultValues($model, $request->input('default_values'))){
@ -444,7 +444,7 @@ class AssetModelsController extends Controller
{ {
return ! empty($input['add_default_values']) return ! empty($input['add_default_values'])
&& ! empty($input['default_values']) && ! empty($input['default_values'])
&& ! empty($input['custom_fieldset']); && ! empty($input['fieldset_id']);
} }
/** /**