From 5280cb346bc40fe9dc221dcdae6c9eb4543de74e Mon Sep 17 00:00:00 2001 From: Ad Schellevis Date: Mon, 24 Apr 2023 20:22:40 +0200 Subject: [PATCH] MVC - SimpleActionButton, prevent crashing out when endpoint doesn't return data. for https://github.com/opnsense/core/issues/6520 --- src/opnsense/www/js/opnsense_ui.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/opnsense/www/js/opnsense_ui.js b/src/opnsense/www/js/opnsense_ui.js index d122b74c3..765c0d9ac 100644 --- a/src/opnsense/www/js/opnsense_ui.js +++ b/src/opnsense/www/js/opnsense_ui.js @@ -568,10 +568,11 @@ $.fn.SimpleActionButton = function (params) { } pre_action().done(function () { ajaxCall(this_button.data('endpoint'), {}, function (data, status) { + let data_status = typeof data == 'object' && 'status' in data ? data['status'] : ''; if (params && params.onAction) { params.onAction(data, status); } - if ((status != "success" || ('status' in data && data['status'].toLowerCase().trim() != 'ok')) && data['status']) { + if ((status != "success" || (data_status.toLowerCase().trim() != 'ok')) && data_status !== '') { BootstrapDialog.show({ type: BootstrapDialog.TYPE_WARNING, title: this_button.data('error-title'),