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

luci-base: form.js: consider aliased options in AbstractValue.remove()

Browse source 
If different options point to the same underlying uci option, we must only
remove the uci value if none of the other alias options is active in order
to prevent inactive options (due to unsatisfied depends) removing the uci
value of active once on save.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit f3f74bd0fe)
This commit is contained in:
Jo-Philipp Wich 2021-06-01 14:45:42 +02:00
parent 5bdb5fd697
commit 9bbf5d4002
1 changed files with 26 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2035,10 +2035,32 @@ var CBIAbstractValue = CBIAbstractElement.extend(/** @lends LuCI.form.AbstractVa
* The configuration section ID
*/
remove: function(section_id) {
return this.map.data.unset(
this.uciconfig || this.section.uciconfig || this.map.config,
this.ucisection || section_id,
this.ucioption || this.option);
var this_cfg = this.uciconfig || this.section.uciconfig || this.map.config,
this_sid = this.ucisection || section_id,
this_opt = this.ucioption || this.option;
for (var i = 0; i < this.section.children.length; i++) {
var sibling = this.section.children[i];
if (sibling === this || sibling.ucioption == null)
continue;
var sibling_cfg = sibling.uciconfig || sibling.section.uciconfig || sibling.map.config,
sibling_sid = sibling.ucisection || section_id,
sibling_opt = sibling.ucioption || sibling.option;
if (this_cfg != sibling_cfg || this_sid != sibling_sid || this_opt != sibling_opt)
continue;
if (!sibling.isActive(section_id))
continue;
/* found another active option aliasing the same uci option name,
* so we can't remove the value */
return;
}
this.map.data.unset(this_cfg, this_sid, this_opt);
}
});