From: Jo-Philipp Wich <jow@openwrt.org>
Date: Wed, 1 Dec 2010 20:54:52 +0000 (+0000)
Subject: modules/admin-full: use String.format('%t', ...) in lease status template
X-Git-Tag: 0.10.0~328
X-Git-Url: https://git.archive.openwrt.org/?a=commitdiff_plain;h=d7ff116d8a793d47eeca319339bdb75c69445d4c;p=project%2Fluci.git

modules/admin-full: use String.format('%t', ...) in lease status template
---

diff --git a/modules/admin-full/luasrc/view/admin_network/lease_status.htm b/modules/admin-full/luasrc/view/admin_network/lease_status.htm
index 3635577f6..e5827106b 100644
--- a/modules/admin-full/luasrc/view/admin_network/lease_status.htm
+++ b/modules/admin-full/luasrc/view/admin_network/lease_status.htm
@@ -21,29 +21,7 @@
 						}
 						else
 						{
-							var d = 0;
-							var h = 0;
-							var m = 0;
-							var s = st[i].expires;
-
-							if (s > 60) {
-								m = Math.floor(s / 60);
-								s = (s % 60);
-							}
-
-							if (m > 60) {
-								h = Math.floor(m / 60);
-								m = (m % 60);
-							}
-
-							if (h > 24) {
-								d = Math.floor(h / 24);
-								h = (h % 24);
-							}
-
-							timestr = (d > 0)
-								? String.format('%dd %dh %dm %ds', d, h, m, s)
-								: String.format('%dh %dm %ds', h, m, s);
+							timestr = String.format('%t', st[i].expires);
 						}
 
 						var tr = tb.insertRow(-1);