luci-mod-network,-status: expose DUID/IAID for DHCPv4

We already show the DUID in one table (in the overview), this makes the
tables under the "DHCP > Leases" tab consistent with the overview, and
exposes the DUID/IAID in both.

Signed-off-by: David Härdeman <[email protected]>

diff --git a/modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js b/modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js
index e4ae4567ebb62fa9f1c07c26a4fddb393d30c7be..530d96cb0eec10e653257e027d82f515d336267c 100644 (file)
--- a/modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js
+++ b/modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js
@@ -43,6 +43,8 @@ const CBILeaseStatus = form.DummyValue.extend({
                                        E('th', { 'class': 'th' }, _('Hostname')),
                                        E('th', { 'class': 'th' }, _('IPv4 address')),
                                        E('th', { 'class': 'th' }, _('MAC address')),
+                                       E('th', { 'class': 'th' }, _('DUID')),
+                                       E('th', { 'class': 'th' }, _('IAID')),
                                        E('th', { 'class': 'th' }, _('Remaining time'))
                                ]),
                                E('tr', { 'class': 'tr placeholder' }, [
@@ -255,6 +257,8 @@ return view.extend({
                                                                host || '-',
                                                                lease.ipaddr,
                                                                vendor ? lease.macaddr + vendor : lease.macaddr,
+                                                               lease.duid || '-',
+                                                               lease.iaid || '-',
                                                                exp
                                                        ];
 

diff --git a/modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js b/modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js
index 3cbc0c31ae583257b35f666fbaeb82247cee581a..990b16704b96756258faf49abfb53f6837994cd1 100644 (file)
--- a/modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js
+++ b/modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js
@@ -111,6 +111,7 @@ return baseclass.extend({
                                E('th', { 'class': 'th' }, _('IPv4 address')),
                                E('th', { 'class': 'th' }, _('MAC address')),
                                E('th', { 'class': 'th' }, _('DUID')),
+                               E('th', { 'class': 'th' }, _('IAID')),
                                E('th', { 'class': 'th' }, _('Remaining time')),
                                isReadonlyView ? E([]) : E('th', { 'class': 'th cbi-section-actions' }, _('Static Lease'))
                        ])
@@ -142,7 +143,8 @@ return baseclass.extend({
                                host || '-',
                                lease.ipaddr,
                                vendor ? lease.macaddr + ` (${vendor})` : lease.macaddr,
-                               lease.duid ? lease.duid : null,
+                               lease.duid || '-',
+                               lease.iaid || '-',
                                exp,
                        ];