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

luci-mod-network: slightly improve static lease config

Browse source 
- Autoselect the matching IPv4 address when initially picking a MAC
 - Add hostname hints in the MAC/IP dropdowns

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
This commit is contained in:
Jo-Philipp Wich 2019-08-21 18:27:38 +02:00
parent ac56dc057d
commit 14b6ea6ea7
1 changed files with 26 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js
View file

@ -345,8 +345,29 @@ return L.view.extend({
return result.length ? result.join(' ') : null; return result.length ? result.join(' ') : null;
}; };
so.renderWidget = function(section_id, option_index, cfgvalue) {
var node = form.Value.prototype.renderWidget.apply(this, [section_id, option_index, cfgvalue]),
ipopt = this.section.children.filter(function(o) { return o.option == 'ip' })[0];
node.addEventListener('cbi-dropdown-change', L.bind(function(ipopt, section_id, ev) {
var mac = ev.detail.value.value;
if (mac == null || mac == '' || !hosts[mac] || !hosts[mac].ipv4)
return;
var ip = ipopt.formvalue(section_id);
if (ip != null && ip != '')
return;
var node = ipopt.map.findElement('id', ipopt.cbid(section_id));
if (node)
L.dom.callClassMethod(node, 'setValue', hosts[mac].ipv4);
}, this, ipopt, section_id));
return node;
};
Object.keys(hosts).forEach(function(mac) { Object.keys(hosts).forEach(function(mac) {
so.value(mac); var hint = hosts[mac].name || hosts[mac].ipv4;
so.value(mac, hint ? '%s (%s)'.format(mac, hint) : mac);
}); });
so = ss.option(form.Value, 'ip', _('<abbr title="Internet Protocol Version 4">IPv4</abbr>-Address')); so = ss.option(form.Value, 'ip', _('<abbr title="Internet Protocol Version 4">IPv4</abbr>-Address'));
@ -363,8 +384,10 @@ return L.view.extend({
return true; return true;
}; };
Object.keys(hosts).forEach(function(mac) { Object.keys(hosts).forEach(function(mac) {
if (hosts[mac].ipv4) if (hosts[mac].ipv4) {
so.value(hosts[mac].ipv4); var hint = hosts[mac].name;
so.value(hosts[mac].ipv4, hint ? '%s (%s)'.format(hosts[mac].ipv4, hint) : hosts[mac].ipv4);
}
}); });
so = ss.option(form.Value, 'leasetime', _('Lease time')); so = ss.option(form.Value, 'leasetime', _('Lease time'));