Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

luci-mod-admin-full: handle infinite lease times in output

Browse source 
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>
This commit is contained in:
Jo-Philipp Wich 2016-12-09 13:07:42 +01:00
parent 8e9e92a630
commit 70bad4da4f
2 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
modules/luci-mod-admin-full/luasrc/view/admin_network/lease_status.htm
View file

@ -27,14 +27,12 @@
{ {
var timestr; var timestr;
if (st[0][i].expires <= 0) if (st[0][i].expires === false)
{ timestr = '<em><%:unlimited%></em>';
else if (st[0][i].expires <= 0)
timestr = '<em><%:expired%></em>'; timestr = '<em><%:expired%></em>';
}
else else
{
timestr = String.format('%t', st[0][i].expires); timestr = String.format('%t', st[0][i].expires);
}
var tr = tb.insertRow(-1); var tr = tb.insertRow(-1);
tr.className = 'cbi-section-table-row cbi-rowstyle-' + ((i % 2) + 1); tr.className = 'cbi-section-table-row cbi-rowstyle-' + ((i % 2) + 1);
@ -69,14 +67,12 @@
{ {
var timestr; var timestr;
if (st[1][i].expires <= 0) if (st[1][i].expires === false)
{ timestr = '<em><%:unlimited%></em>';
else if (st[1][i].expires <= 0)
timestr = '<em><%:expired%></em>'; timestr = '<em><%:expired%></em>';
}
else else
{
timestr = String.format('%t', st[1][i].expires); timestr = String.format('%t', st[1][i].expires);
}
var tr = tb6.insertRow(-1); var tr = tb6.insertRow(-1);
tr.className = 'cbi-section-table-row cbi-rowstyle-' + ((i % 2) + 1); tr.className = 'cbi-section-table-row cbi-rowstyle-' + ((i % 2) + 1);

8
modules/luci-mod-admin-full/luasrc/view/admin_status/index.htm
View file

@ -341,7 +341,9 @@
{ {
var timestr; 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>'; timestr = '<em><%:expired%></em>';
else else
timestr = String.format('%t', info.leases[i].expires); timestr = String.format('%t', info.leases[i].expires);
@ -379,7 +381,9 @@
{ {
var timestr; 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>'; timestr = '<em><%:expired%></em>';
else else
timestr = String.format('%t', info.leases6[i].expires); timestr = String.format('%t', info.leases6[i].expires);