openwrt-mirror/luci
1
0
Fork 0
mirror of https://github.com/openwrt/luci.git synced 2025-12-21 19:14:34 +04:00
Code Issues Packages Projects Releases Wiki Activity

luci-mod-network: simplify cbi_update_table in dhcp.js

Browse Source 
cbi_update_table() can already take a string suitable for
.querySelector() as its first argument. In addition, it will do the
right thing if the element isn't found, so this can be simplified a bit.

Signed-off-by: David Härdeman <david@hardeman.nu>
This commit is contained in:
David Härdeman
2025-10-21 22:15:56 +02:00
committed by Paul Donald
parent 495380a926
commit 57afc27d2d
1 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js
View File

@@ -761,7 +761,7 @@ return view.extend({
var leases = Array.isArray(leaseinfo.dhcp_leases) ? leaseinfo.dhcp_leases : [], var leases = Array.isArray(leaseinfo.dhcp_leases) ? leaseinfo.dhcp_leases : [],
leases6 = Array.isArray(leaseinfo.dhcp6_leases) ? leaseinfo.dhcp6_leases : []; leases6 = Array.isArray(leaseinfo.dhcp6_leases) ? leaseinfo.dhcp6_leases : [];
cbi_update_table(mapEl.querySelector('#lease_status_table'), cbi_update_table('#lease_status_table',
leases.map(function(lease) { leases.map(function(lease) {
var exp; var exp;
var vendor; var vendor;
@@ -796,41 +796,41 @@ return view.extend({
exp exp
]; ];
}), }),
E('em', _('There are no active leases'))); E('em', _('There are no active leases'))
);
if (has_dhcpv6) { cbi_update_table('#lease6_status_table',
cbi_update_table(mapEl.querySelector('#lease6_status_table'), leases6.map(function(lease) {
leases6.map(function(lease) { var exp;
var exp;
if (lease.expires === false) if (lease.expires === false)
exp = E('em', _('unlimited')); exp = E('em', _('unlimited'));
else if (lease.expires <= 0) else if (lease.expires <= 0)
exp = E('em', _('expired')); exp = E('em', _('expired'));
else else
exp = '%t'.format(lease.expires); exp = '%t'.format(lease.expires);
var hint = lease.macaddr ? hosts[lease.macaddr] : null, var hint = lease.macaddr ? hosts[lease.macaddr] : null,
name = hint ? (hint.name || L.toArray(hint.ipaddrs || hint.ipv4)[0] || L.toArray(hint.ip6addrs || hint.ipv6)[0]) : null, name = hint ? (hint.name || L.toArray(hint.ipaddrs || hint.ipv4)[0] || L.toArray(hint.ip6addrs || hint.ipv6)[0]) : null,
host = null; host = null;
if (name && lease.hostname && lease.hostname != name && lease.ip6addr != name) if (name && lease.hostname && lease.hostname != name && lease.ip6addr != name)
host = '%s (%s)'.format(lease.hostname, name); host = '%s (%s)'.format(lease.hostname, name);
else if (lease.hostname) else if (lease.hostname)
host = lease.hostname; host = lease.hostname;
else if (name) else if (name)
host = name; host = name;
return [ return [
host || '-', host || '-',
lease.ip6addrs ? lease.ip6addrs.join('<br />') : lease.ip6addr, lease.ip6addrs ? lease.ip6addrs.join('<br />') : lease.ip6addr,
lease.duid, lease.duid,
lease.iaid, lease.iaid,
exp exp
]; ];
}), }),
E('em', _('There are no active leases'))); E('em', _('There are no active leases'))
} );
}); });
}); });