diff --git a/app/Http/Controllers/CustomFieldsController.php b/app/Http/Controllers/CustomFieldsController.php index a8305c6dd..d539b636c 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"]); + + } /**