From 6174f9b93f89a3e6ff4f9b1ecd796ca60bcf716a Mon Sep 17 00:00:00 2001 From: snipe Date: Wed, 1 Apr 2020 01:25:31 -0700 Subject: [PATCH] Check that there is actually a filed ID submitted --- .../Controllers/CustomFieldsetsController.php | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/app/Http/Controllers/CustomFieldsetsController.php b/app/Http/Controllers/CustomFieldsetsController.php index 075d534a16..e3e0ddcb90 100644 --- a/app/Http/Controllers/CustomFieldsetsController.php +++ b/app/Http/Controllers/CustomFieldsetsController.php @@ -179,14 +179,19 @@ class CustomFieldsetsController extends Controller $this->authorize('update', $set); - foreach ($set->fields as $field) { - if ($field->id == $request->input('field_id')) { - return redirect()->route("fieldsets.show", [$id])->withInput()->withErrors(['field_id' => trans('admin/custom_fields/message.field.already_added')]); + if ($request->filled('field_id')) { + foreach ($set->fields as $field) { + if ($field->id == $request->input('field_id')) { + return redirect()->route("fieldsets.show", [$id])->withInput()->withErrors(['field_id' => trans('admin/custom_fields/message.field.already_added')]); + } } + + $results = $set->fields()->attach(Input::get('field_id'), ["required" => ($request->input('required') == "on"),"order" => $request->input('order', 1)]); + + return redirect()->route("fieldsets.show", [$id])->with("success", trans('admin/custom_fields/message.field.create.assoc_success')); } + return redirect()->route("fieldsets.show", [$id])->with("error", 'No field selected.'); - $results = $set->fields()->attach(Input::get('field_id'), ["required" => ($request->input('required') == "on"),"order" => $request->input('order', 1)]); - return redirect()->route("fieldsets.show", [$id])->with("success", trans('admin/custom_fields/message.field.create.assoc_success')); } }