Mirrors
/
aredn
mirror of https://github.com/aredn/aredn.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix display of previous neighbors (#1133)

This commit is contained in:
Tim Wilkinson 2024-03-28 15:43:09 -07:00 committed by GitHub
parent f75e4d9675
commit 4337fc6393
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 26 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
files/www/cgi-bin/mesh
View File

@ -899,10 +899,12 @@ do
end
end
local cn = {}
if #rows > 0 then
table.sort(rows, function(a,b) return a.key < b.key end)
for _, row in ipairs(rows)
do
cn[row.key] = true
html.print(row.row)
end
-- discard
@ -924,32 +926,33 @@ do
else
host = host:gsub("^mid%d+%.", ""):gsub("^dtdlink%.", "")
end
local row = "<tr><td style='color:sienna;'>" .. host
if hosts[ip] and hosts[ip].hosts then
for _, v in ipairs(hosts[ip].hosts)
do
row = row .. "<br>" .. v
end
end
row = row .. "</td><td style='color:sienna;'>"
if not cn[host:lower()] then
local row = "<tbody style='color:sienna;'><tr><td>" .. host .. "</td><td colspan=7></td><td style='text-align:left'>"
if age < 3600 then
local val = math.floor(age / 60)
if val == 1 then
row = row .. "1 minute ago"
row = row .. "1 minute ago</td></tr>"
else
row = row .. val .. " minutes ago"
row = row .. val .. " minutes ago</td></tr>"
end
else
local val = string.format("%.1f", age / 3600)
if val == "1.0" then
row = row .. "1 hour ago"
row = row .. "1 hour ago</td></tr>"
else
row = row .. val .. " hours ago"
row = row .. val .. " hours ago</td></tr>"
end
end
row = row .. "</td></tr>"
if hosts[ip] and hosts[ip].hosts then
for _, v in ipairs(hosts[ip].hosts)
do
row = row .. "<tr><td></td><td colspan=8>" .. v .. "</td></tr>"
end
end
row = row .. "</tbody>"
rows[#rows + 1] = { key = age, row = row }
end
end
end
if #rows > 0 then
html.print("<tr><td style='color:sienna;font-weight:bold;padding-top:10px;'>Previous Neighbors</td></tr>")
@ -961,6 +964,7 @@ if #rows > 0 then
-- discard
rows = nil
end
cn = nil
-- end current neighbors table
html.print("</table>")