From d21ef8cabd383d7a2b9f4590ce95e784546fdd43 Mon Sep 17 00:00:00 2001 From: EngincanV Date: Thu, 6 Nov 2025 16:06:52 +0300 Subject: [PATCH 1/3] cms: check form validity for addWidgetModal --- .../Pages/CmsKit/Contents/addWidgetModal.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/addWidgetModal.js b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/addWidgetModal.js index 6786870c6b..83f75fb7e1 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/addWidgetModal.js +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/addWidgetModal.js @@ -25,6 +25,10 @@ $(function () { $(".save-changes").click(function () { + if(!activeForm.valid()) { + return; + } + let properties = activeForm.serializeFormToObject(); let widgetText = "[Widget Type=\"" + widgetType + "\" "; From 5f19037dd92e3dfde3cb2be246c6d91b4b447645 Mon Sep 17 00:00:00 2001 From: EngincanV Date: Thu, 6 Nov 2025 16:36:29 +0300 Subject: [PATCH 2/3] Fix null reference error in addWidgetModal.js Added checks to ensure activeForm is defined before calling its methods in the save-changes click handler, preventing potential runtime errors when activeForm is null or undefined. --- .../Pages/CmsKit/Contents/addWidgetModal.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/addWidgetModal.js b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/addWidgetModal.js index 83f75fb7e1..69d2e12909 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/addWidgetModal.js +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/addWidgetModal.js @@ -25,11 +25,11 @@ $(function () { $(".save-changes").click(function () { - if(!activeForm.valid()) { + if (activeForm && !activeForm.valid()) { return; } - let properties = activeForm.serializeFormToObject(); + let properties = activeForm ? activeForm.serializeFormToObject() : {}; let widgetText = "[Widget Type=\"" + widgetType + "\" "; From 36bd58b2743d2fb9d8a1e9a6998f0a0b51180eaf Mon Sep 17 00:00:00 2001 From: EngincanV Date: Thu, 6 Nov 2025 17:08:13 +0300 Subject: [PATCH 3/3] Update addWidgetModal.js --- .../Pages/CmsKit/Contents/addWidgetModal.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/addWidgetModal.js b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/addWidgetModal.js index 69d2e12909..cc8ed1a997 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/addWidgetModal.js +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/addWidgetModal.js @@ -25,7 +25,7 @@ $(function () { $(".save-changes").click(function () { - if (activeForm && !activeForm.valid()) { + if (activeForm && activeForm.length > 0 && !activeForm.valid()) { return; }