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

luci-base: uci.js: fix variable clash

Browse source 
Don't overwrite the `r` variable which is supposed to refer to the reordered
uci sections with temporary data for collecting uci add parameters.

Fixes stray uci/get permission errors caused by an attempt to load
nonsensical uci package names.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
This commit is contained in:
Jo-Philipp Wich 2020-04-13 12:22:13 +02:00
parent 0d0ad80fd1
commit 55cb5a753b
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
modules/luci-base/htdocs/luci-static/resources/uci.js
View file

@ -790,22 +790,22 @@ return baseclass.extend(/** @lends LuCI.uci.prototype */ {
if (n) if (n)
for (var conf in n) { for (var conf in n) {
for (var sid in n[conf]) { for (var sid in n[conf]) {
var r = { var p = {
config: conf, config: conf,
values: { } values: { }
}; };
for (var k in n[conf][sid]) { for (var k in n[conf][sid]) {
if (k == '.type') if (k == '.type')
r.type = n[conf][sid][k]; p.type = n[conf][sid][k];
else if (k == '.create') else if (k == '.create')
r.name = n[conf][sid][k]; p.name = n[conf][sid][k];
else if (k.charAt(0) != '.') else if (k.charAt(0) != '.')
r.values[k] = n[conf][sid][k]; p.values[k] = n[conf][sid][k];
} }
snew.push(n[conf][sid]); snew.push(n[conf][sid]);
tasks.push(self.callAdd(r.config, r.type, r.name, r.values)); tasks.push(self.callAdd(p.config, p.type, p.name, p.values));
} }
pkgs[conf] = true; pkgs[conf] = true;