From 70bad4da4fcd44715445c36d8c4b9f8a00d92b4d Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Fri, 9 Dec 2016 13:07:42 +0100 Subject: luci-mod-admin-full: handle infinite lease times in output When a lease objects expires property is set to "false", its expiry time is unlimited, so adjust the templates to properly display that state. Signed-off-by: Jo-Philipp Wich --- modules/luci-mod-admin-full/luasrc/view/admin_status/index.htm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'modules/luci-mod-admin-full/luasrc/view/admin_status') diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_status/index.htm b/modules/luci-mod-admin-full/luasrc/view/admin_status/index.htm index eb46488062..8976e30cba 100644 --- a/modules/luci-mod-admin-full/luasrc/view/admin_status/index.htm +++ b/modules/luci-mod-admin-full/luasrc/view/admin_status/index.htm @@ -341,7 +341,9 @@ { var timestr; - if (info.leases[i].expires <= 0) + if (info.leases[i].expires === false) + timestr = '<%:unlimited%>'; + else if (info.leases[i].expires <= 0) timestr = '<%:expired%>'; else timestr = String.format('%t', info.leases[i].expires); @@ -379,7 +381,9 @@ { var timestr; - if (info.leases6[i].expires <= 0) + if (info.leases6[i].expires === false) + timestr = '<%:unlimited%>'; + else if (info.leases6[i].expires <= 0) timestr = '<%:expired%>'; else timestr = String.format('%t', info.leases6[i].expires); -- cgit v1.2.3