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

Merge pull request #5190 from TDT-AG/pr/20210715-proto-bonding

Browse source 
luci-proto-bonding: fix member because of API change
This commit is contained in:
Jo-Philipp Wich 2021-08-09 19:47:23 +02:00 committed by GitHub
commit 3d2a2ec1fa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
protocols/luci-proto-bonding/htdocs/luci-static/resources/protocol/bonding.js
View file

@ -24,14 +24,16 @@ function getSelectableSlaves(section_id) {
var slaves = L.toArray(uci.get('network', interfaces[j]['.name'], 'slaves')); var slaves = L.toArray(uci.get('network', interfaces[j]['.name'], 'slaves'));
for (var k = 0; k < slaves.length; k++) { for (var k = 0; k < slaves.length; k++) {
if (devices[i].ifname == slaves[k] && interfaces[j]['.name'] != section_id) { if (devices[i].ifname == slaves[k] || devices[i].device == slaves[k]) {
in_use = true; if (interfaces[j]['.name'] != section_id) {
in_use = true;
}
} }
} }
} }
} }
if (in_use == false) { if (in_use == false) {
rv.push(devices[i].ifname); devices[i].device == null ? rv.push(devices[i].ifname) : rv.push(devices[i].device)
} }
} }
} }