luci-base: form.js: allow secondary configs to fail loading

Ref: https://forum.openwrt.org/t/luci-rpc-error/61760
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 9e0a80ad334d81a4e2563e90a1d467b9d9c79bdc..987640f000e241558ff638e0f96c7a6b97ec5d01 100644 (file)
--- a/modules/luci-base/htdocs/luci-static/resources/form.js
+++ b/modules/luci-base/htdocs/luci-static/resources/form.js
@@ -531,12 +531,15 @@ var CBIMap = CBIAbstractElement.extend(/** @lends LuCI.form.Map.prototype */ {
         * an error.
         */
        load: function() {
-               var doCheckACL = (!(this instanceof CBIJSONMap) && this.readonly == null);
+               var doCheckACL = (!(this instanceof CBIJSONMap) && this.readonly == null),
+                   loadTasks = [ doCheckACL ? callSessionAccess('uci', this.config, 'write') : true ],
+                   configs = this.parsechain || [ this.config ];
 
-               return Promise.all([
-                       doCheckACL ? callSessionAccess('uci', this.config, 'write') : true,
-                       this.data.load(this.parsechain || [ this.config ])
-               ]).then(L.bind(function(res) {
+               loadTasks.push.apply(loadTasks, configs.map(L.bind(function(config, i) {
+                       return i ? L.resolveDefault(this.data.load(config)) : this.data.load(config);
+               }, this)));
+
+               return Promise.all(loadTasks).then(L.bind(function(res) {
                        if (res[0] === false)
                                this.readonly = true;