luci-base: uci.js: fix option deletion quirks
Since option deletions are sent first, followed by ubus set commands, a call sequence like: uci.set('config', 'section', 'option', ['foo', 'bar']) uci.set('config', 'section', 'option', ['foo']) uci.unset('config', 'section', 'option') ... would result in the option retainining `foo` as value, instead of it getting removed as one would expect. Fix this issue by reverting the internal change state of the option before storing the deletion. While we're at it, also rework the internal tracking of deleted options to not result in duplicate removal requests when the same option is unset several times. Finally change all `undefined` returns to `null` in order to comply with the function documentation. Signed-off-by: Jo-Philipp Wich <jo@mein.io>
This commit is contained in:
parent
9bc5865339
commit
bd5e2edb46
1 changed files with 35 additions and 25 deletions
|
@ -402,7 +402,7 @@ return baseclass.extend(/** @lends LuCI.uci.prototype */ {
|
||||||
for (var s in v)
|
for (var s in v)
|
||||||
if (!d || d[s] !== true)
|
if (!d || d[s] !== true)
|
||||||
if (!type || v[s]['.type'] == type)
|
if (!type || v[s]['.type'] == type)
|
||||||
sa.push(Object.assign({ }, v[s], c ? c[s] : undefined));
|
sa.push(Object.assign({ }, v[s], c ? c[s] : null));
|
||||||
|
|
||||||
if (n)
|
if (n)
|
||||||
for (var s in n)
|
for (var s in n)
|
||||||
|
@ -462,7 +462,7 @@ return baseclass.extend(/** @lends LuCI.uci.prototype */ {
|
||||||
/* requested option in a just created section */
|
/* requested option in a just created section */
|
||||||
if (n[conf] && n[conf][sid]) {
|
if (n[conf] && n[conf][sid]) {
|
||||||
if (!n[conf])
|
if (!n[conf])
|
||||||
return undefined;
|
return null;
|
||||||
|
|
||||||
if (opt == null)
|
if (opt == null)
|
||||||
return n[conf][sid];
|
return n[conf][sid];
|
||||||
|
@ -473,14 +473,9 @@ return baseclass.extend(/** @lends LuCI.uci.prototype */ {
|
||||||
/* requested an option value */
|
/* requested an option value */
|
||||||
if (opt != null) {
|
if (opt != null) {
|
||||||
/* check whether option was deleted */
|
/* check whether option was deleted */
|
||||||
if (d[conf] && d[conf][sid]) {
|
if (d[conf] && d[conf][sid])
|
||||||
if (d[conf][sid] === true)
|
if (d[conf][sid] === true || d[conf][sid][opt])
|
||||||
return undefined;
|
return null;
|
||||||
|
|
||||||
for (var i = 0; i < d[conf][sid].length; i++)
|
|
||||||
if (d[conf][sid][i] == opt)
|
|
||||||
return undefined;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* check whether option was changed */
|
/* check whether option was changed */
|
||||||
if (c[conf] && c[conf][sid] && c[conf][sid][opt] != null)
|
if (c[conf] && c[conf][sid] && c[conf][sid][opt] != null)
|
||||||
|
@ -490,14 +485,14 @@ return baseclass.extend(/** @lends LuCI.uci.prototype */ {
|
||||||
if (v[conf] && v[conf][sid])
|
if (v[conf] && v[conf][sid])
|
||||||
return v[conf][sid][opt];
|
return v[conf][sid][opt];
|
||||||
|
|
||||||
return undefined;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* requested an entire section */
|
/* requested an entire section */
|
||||||
if (v[conf])
|
if (v[conf])
|
||||||
return v[conf][sid];
|
return v[conf][sid];
|
||||||
|
|
||||||
return undefined;
|
return null;
|
||||||
},
|
},
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -555,28 +550,39 @@ return baseclass.extend(/** @lends LuCI.uci.prototype */ {
|
||||||
|
|
||||||
/* undelete option */
|
/* undelete option */
|
||||||
if (d[conf] && d[conf][sid]) {
|
if (d[conf] && d[conf][sid]) {
|
||||||
d[conf][sid] = d[conf][sid].filter(function(o) { return o !== opt });
|
var empty = true;
|
||||||
|
|
||||||
if (d[conf][sid].length == 0)
|
for (var key in d[conf][sid]) {
|
||||||
|
if (key != opt && d[conf][sid].hasOwnProperty(key)) {
|
||||||
|
empty = false;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (empty)
|
||||||
delete d[conf][sid];
|
delete d[conf][sid];
|
||||||
|
else
|
||||||
|
delete d[conf][sid][opt];
|
||||||
}
|
}
|
||||||
|
|
||||||
c[conf][sid][opt] = val;
|
c[conf][sid][opt] = val;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
/* only delete in existing sections */
|
/* revert any change for to-be-deleted option */
|
||||||
if (!(v[conf] && v[conf][sid] && v[conf][sid].hasOwnProperty(opt)) &&
|
if (c[conf] && c[conf][sid])
|
||||||
!(c[conf] && c[conf][sid] && c[conf][sid].hasOwnProperty(opt)))
|
delete c[conf][sid][opt];
|
||||||
return;
|
|
||||||
|
|
||||||
|
/* only delete existing options */
|
||||||
|
if (v[conf] && v[conf][sid] && v[conf][sid].hasOwnProperty(opt)) {
|
||||||
if (!d[conf])
|
if (!d[conf])
|
||||||
d[conf] = { };
|
d[conf] = { };
|
||||||
|
|
||||||
if (!d[conf][sid])
|
if (!d[conf][sid])
|
||||||
d[conf][sid] = [ ];
|
d[conf][sid] = { };
|
||||||
|
|
||||||
if (d[conf][sid] !== true)
|
if (d[conf][sid] !== true)
|
||||||
d[conf][sid].push(opt);
|
d[conf][sid][opt] = true;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
|
@ -796,7 +802,11 @@ return baseclass.extend(/** @lends LuCI.uci.prototype */ {
|
||||||
for (var conf in d) {
|
for (var conf in d) {
|
||||||
for (var sid in d[conf]) {
|
for (var sid in d[conf]) {
|
||||||
var o = d[conf][sid];
|
var o = d[conf][sid];
|
||||||
tasks.push(self.callDelete(conf, sid, (o === true) ? null : o));
|
|
||||||
|
if (o === true)
|
||||||
|
tasks.push(self.callDelete(conf, sid, null));
|
||||||
|
else
|
||||||
|
tasks.push(self.callDelete(conf, sid, Object.keys(o)));
|
||||||
}
|
}
|
||||||
|
|
||||||
pkgs[conf] = true;
|
pkgs[conf] = true;
|
||||||
|
|
Loading…
Reference in a new issue