From 96e3a03d8e6d261c6b67e25ae1dc91900a2614b4 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Mon, 13 Apr 2020 12:22:13 +0200 Subject: [PATCH] luci-base: uci.js: fix variable clash 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 (cherry picked from commit 55cb5a753b94e2eee049546a2af374bb6129d4c4) --- modules/luci-base/htdocs/luci-static/resources/uci.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/luci-base/htdocs/luci-static/resources/uci.js b/modules/luci-base/htdocs/luci-static/resources/uci.js index f381e0b649..916dbb310b 100644 --- a/modules/luci-base/htdocs/luci-static/resources/uci.js +++ b/modules/luci-base/htdocs/luci-static/resources/uci.js @@ -784,22 +784,22 @@ return baseclass.extend(/** @lends LuCI.uci.prototype */ { if (n) for (var conf in n) { for (var sid in n[conf]) { - var r = { + var p = { config: conf, values: { } }; for (var k in n[conf][sid]) { if (k == '.type') - r.type = n[conf][sid][k]; + p.type = n[conf][sid][k]; else if (k == '.create') - r.name = n[conf][sid][k]; + p.name = n[conf][sid][k]; else if (k.charAt(0) != '.') - r.values[k] = n[conf][sid][k]; + p.values[k] = n[conf][sid][k]; } 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; -- 2.30.2