From dd47f3f6742a6d80221b75aa7b6ea27eca2bb535 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Sat, 4 Feb 2023 22:15:42 +0100 Subject: [PATCH] luci-base: form.js: reuse JSONMap data provider in GridSection modals Reuse the same data provider as the parent JSONMap instance in order to avoid inadvertently mangling the form data when saving the modal edit dialog. Fixes: bb9ede238a ("luci-base: form.js: reuse JSONMap data provider in GridSection modals") Signed-off-by: Jo-Philipp Wich --- modules/luci-base/htdocs/luci-static/resources/form.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/modules/luci-base/htdocs/luci-static/resources/form.js b/modules/luci-base/htdocs/luci-static/resources/form.js index 4edfc7e135..317b49fdfe 100644 --- a/modules/luci-base/htdocs/luci-static/resources/form.js +++ b/modules/luci-base/htdocs/luci-static/resources/form.js @@ -3213,10 +3213,13 @@ var CBITableSection = CBITypedSection.extend(/** @lends LuCI.form.TableSection.p var m; - if (parent instanceof CBIJSONMap) - m = new CBIJSONMap(parent.data.data, null, null); - else + if (parent instanceof CBIJSONMap) { + m = new CBIJSONMap(null, null, null); + m.data = parent.data; + } + else { m = new CBIMap(parent.config, null, null); + } var s = m.section(CBINamedSection, section_id, this.sectiontype); -- 2.30.2