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

luci-base: form.js: fix handling of array sections in JSONMap forms

Browse source 
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 682f628ea6)
This commit is contained in:
Jo-Philipp Wich 2020-06-14 16:41:02 +02:00
parent 79fa9ba183
commit b894a3b9aa
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -19,17 +19,7 @@ var CBIJSONConfig = baseclass.extend({
if (!data.hasOwnProperty(sectiontype))
continue;
if (L.isObject(data[sectiontype])) {
this.data[sectiontype] = Object.assign(data[sectiontype], {
'.anonymous': false,
'.name': sectiontype,
'.type': sectiontype
});
section_ids.push(sectiontype);
num_sections++;
}
else if (Array.isArray(data[sectiontype])) {
if (Array.isArray(data[sectiontype])) {
for (var i = 0, index = 0; i < data[sectiontype].length; i++) {
var item = data[sectiontype][i],
anonymous, name;
@ -57,6 +47,16 @@ var CBIJSONConfig = baseclass.extend({
});
}
}
else if (L.isObject(data[sectiontype])) {
this.data[sectiontype] = Object.assign(data[sectiontype], {
'.anonymous': false,
'.name': sectiontype,
'.type': sectiontype
});
section_ids.push(sectiontype);
num_sections++;
}
}
section_ids.sort(L.bind(function(a, b) {