Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
Ref: https://forum.openwrt.org/t/luci-rpc-error/61760
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(backported from commit 17ffc84a29)
This commit is contained in:
Jo-Philipp Wich 2020-04-28 09:46:22 +02:00
parent 6d072352b3
commit 561de16a5d
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
modules/luci-base/htdocs/luci-static/resources/form.js
View file

@ -520,8 +520,16 @@ var CBIMap = CBIAbstractElement.extend(/** @lends LuCI.form.Map.prototype */ {
* an error. * an error.
*/ */
load: function() { load: function() {
return this.data.load(this.parsechain || [ this.config ]) var loadTasks = [],
.then(this.loadChildren.bind(this)); configs = this.parsechain || [ this.config ];
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) {
return this.loadChildren();
}, this));
}, },
/** /**