From b9a8d45c078166aaaf6a68559e802c4b80fa3db8 Mon Sep 17 00:00:00 2001 From: snipe Date: Wed, 9 Feb 2022 16:30:42 -0800 Subject: [PATCH] Better messaging Signed-off-by: snipe --- app/Http/Controllers/CustomFieldsController.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/CustomFieldsController.php b/app/Http/Controllers/CustomFieldsController.php index a8305c6ddb..d539b636c3 100644 --- a/app/Http/Controllers/CustomFieldsController.php +++ b/app/Http/Controllers/CustomFieldsController.php @@ -141,11 +141,15 @@ class CustomFieldsController extends Controller if ($field->fieldset()->detach($fieldset_id)) { return redirect()->route('fieldsets.show', ['fieldset' => $fieldset_id]) ->with("success", trans('admin/custom_fields/message.field.delete.success')); - } - + } else { + return redirect()->back()->withErrors(['message' => "Field is in use and cannot be deleted."]); + } + } - + return redirect()->back()->withErrors(['message' => "Error deleting field from fieldset"]); + + } /**