From: Jo-Philipp Wich <jo@mein.io>
Date: Mon, 16 May 2022 09:49:28 +0000 (+0200)
Subject: luci-base: form.js: reset parent maps on returning from nested section modal
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=0c81e25faa9ff9cb6edec477d56145d70be87cf3;p=project%2Fluci.git

luci-base: form.js: reset parent maps on returning from nested section modal

The nested section modal might have changed values also covered/displayed by
the parent map, so ensure to reload all parent maps in the current modal
view stack to ensure that no stale values are shown on return.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
---

diff --git a/modules/luci-base/htdocs/luci-static/resources/form.js b/modules/luci-base/htdocs/luci-static/resources/form.js
index eb7a2572d4..6786d3d234 100644
--- a/modules/luci-base/htdocs/luci-static/resources/form.js
+++ b/modules/luci-base/htdocs/luci-static/resources/form.js
@@ -2994,10 +2994,20 @@ var CBITableSection = CBITypedSection.extend(/** @lends LuCI.form.TableSection.p
 
 	/** @private */
 	handleModalCancel: function(modalMap, ev) {
-		var prevNode = this.getPreviousModalMap();
+		var prevNode = this.getPreviousModalMap(),
+		    resetTasks = Promise.resolve();
 
 		if (prevNode) {
-			var heading = prevNode.parentNode.querySelector('h4');
+			var heading = prevNode.parentNode.querySelector('h4'),
+			    prevMap = dom.findClassInstance(prevNode);
+
+			while (prevMap) {
+				resetTasks = resetTasks
+					.then(L.bind(prevMap.load, prevMap))
+					.then(L.bind(prevMap.reset, prevMap));
+
+				prevMap = prevMap.parent;
+			}
 
 			prevNode.classList.add('flash');
 			prevNode.classList.remove('hidden');
@@ -3014,7 +3024,7 @@ var CBITableSection = CBITypedSection.extend(/** @lends LuCI.form.TableSection.p
 			ui.hideModal();
 		}
 
-		return Promise.resolve();
+		return resetTasks;
 	},
 
 	/** @private */