summaryrefslogtreecommitdiffhomepage
path: root/modules/luci-mod-admin-full/luasrc/view/admin_status
diff options
context:
space:
mode:
authorJo-Philipp Wich <jo@mein.io>2016-12-09 13:07:42 +0100
committerJo-Philipp Wich <jo@mein.io>2016-12-09 13:07:42 +0100
commit70bad4da4fcd44715445c36d8c4b9f8a00d92b4d (patch)
treed433d3e10f4f61f66ae2fd8e19d7224477245ae5 /modules/luci-mod-admin-full/luasrc/view/admin_status
parent8e9e92a630a9e18eef642c02b8a7fa476440ab37 (diff)
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 <jo@mein.io>
Diffstat (limited to 'modules/luci-mod-admin-full/luasrc/view/admin_status')
-rw-r--r--modules/luci-mod-admin-full/luasrc/view/admin_status/index.htm8
1 files changed, 6 insertions, 2 deletions
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 = '<em><%:unlimited%></em>';
+ else if (info.leases[i].expires <= 0)
timestr = '<em><%:expired%></em>';
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 = '<em><%:unlimited%></em>';
+ else if (info.leases6[i].expires <= 0)
timestr = '<em><%:expired%></em>';
else
timestr = String.format('%t', info.leases6[i].expires);