Fixed device details when interface has no IP.
Ylian Saint-Hilaire committed
Jul 1, 2021 at 13:26 UTC
fee32a54f7ab5cd06bfb02d1c3181866628b6158
2 files changed
+6
-6
views/default-mobile.handlebars
+2
-2
@@ -5402,14 +5402,14 @@
5402
if (iplayer.gateway && iplayer.netmask) {
5403
x += addDetailItem("IPv4 Layer", format("{0}, Mask: {1}, Gateway: {2}", EscapeHtml(iplayer.address), EscapeHtml(iplayer.netmask), EscapeHtml(iplayer.gateway)));
5404
} else {
5405
- x += addDetailItem("IPv4 Layer", format("{0}", EscapeHtml(iplayer.address)));
5405
+ if (iplayer.address) { x += addDetailItem("IPv4 Layer", format("{0}", EscapeHtml(iplayer.address))); }
5406
}
5407
}
5408
if (iplayer.family == 'IPv6') {
5409
if (iplayer.gateway && iplayer.netmask) {
5410
x += addDetailItem("IPv6 Layer", format("{0}, Mask: {1}, Gateway: {2}", EscapeHtml(iplayer.address), EscapeHtml(iplayer.netmask), EscapeHtml(iplayer.gateway)));
5411
} else {
5412
- x += addDetailItem("IPv6 Layer", format("{0}", EscapeHtml(iplayer.address)));
5412
+ if (iplayer.address) { x += addDetailItem("IPv6 Layer", format("{0}", EscapeHtml(iplayer.address))); }
5413
}
5414
}
5415
}
views/default.handlebars
+4
-4
@@ -9951,7 +9951,7 @@
9951
if (m.gatewaymac) {
9952
x += addDetailItem("MAC Layer", format("MAC: {0}, Gateway: {1}", EscapeHtml(m.mac), EscapeHtml(m.gatewaymac)));
9953
} else {
9954
- x += addDetailItem("MAC Layer", format("MAC: {0}", EscapeHtml(m.mac)));
9954
+ if (m.mac) { x += addDetailItem("MAC Layer", format("MAC: {0}", EscapeHtml(m.mac))); }
9955
}
9956
}
9957
for (var j in m.ipv4layer) {
@@ -9959,7 +9959,7 @@
9959
if (ipv4layer.v4gateway && ipv4layer.v4mask) {
9960
x += addDetailItem("IPv4 Layer", format("IP: {0}, Mask: {1}, Gateway: {2}", EscapeHtml(ipv4layer.v4addr), EscapeHtml(ipv4layer.v4mask), EscapeHtml(ipv4layer.v4gateway)));
9961
} else {
9962
- x += addDetailItem("IPv4 Layer", format("IP: {0}", EscapeHtml(ipv4layer.v4addr)));
9962
+ if (ipv4layer.v4addr) { x += addDetailItem("IPv4 Layer", format("IP: {0}", EscapeHtml(ipv4layer.v4addr))); }
9963
}
9964
}
9965
x += '</div>';
@@ -9996,14 +9996,14 @@
9996
if (iplayer.gateway && iplayer.netmask) {
9997
x += addDetailItem("IPv4 Layer", format("IP: {0}, Mask: {1}, Gateway: {2}", EscapeHtml(iplayer.address), EscapeHtml(iplayer.netmask), EscapeHtml(iplayer.gateway)));
9998
} else {
9999
- x += addDetailItem("IPv4 Layer", format("IP: {0}", EscapeHtml(iplayer.address)));
9999
+ if (iplayer.address) { x += addDetailItem("IPv4 Layer", format("IP: {0}", EscapeHtml(iplayer.address))); }
10000
}
10001
}
10002
if (iplayer.family == 'IPv6') {
10003
if (iplayer.gateway && iplayer.netmask) {
10004
x += addDetailItem("IPv6 Layer", format("IP: {0}, Mask: {1}, Gateway: {2}", EscapeHtml(iplayer.address), EscapeHtml(iplayer.netmask), EscapeHtml(iplayer.gateway)));
10005
} else {
10006
- x += addDetailItem("IPv6 Layer", format("IP: {0}", EscapeHtml(iplayer.address)));
10006
+ if (iplayer.address) { x += addDetailItem("IPv6 Layer", format("IP: {0}", EscapeHtml(iplayer.address))); }
10007
}
10008
}
10009
}