From: pmelange <isprotejesvalkata@gmail.com>
Date: Mon, 5 Nov 2018 15:37:19 +0000 (+0100)
Subject: luci-app-olsr: convert mid.htm to new json plugin
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=7fb197c10a0c5b6d3908a6511ead043219be5492;p=project%2Fluci.git

luci-app-olsr: convert mid.htm to new json plugin

Signed-off-by: pmelange <isprotejesvalkata@gmail.com>
---

diff --git a/applications/luci-app-olsr/luasrc/controller/olsr.lua b/applications/luci-app-olsr/luasrc/controller/olsr.lua
index ff4a248dae..e2e93d2693 100644
--- a/applications/luci-app-olsr/luasrc/controller/olsr.lua
+++ b/applications/luci-app-olsr/luasrc/controller/olsr.lua
@@ -300,7 +300,7 @@ function action_mid()
 
 	local function compare(a,b)
 		if a.proto == b.proto then
-			return a.ipAddress < b.ipAddress
+			return a.main.ipAddress < b.main.ipAddress
 		else
 			return a.proto < b.proto
 		end
diff --git a/applications/luci-app-olsr/luasrc/view/status-olsr/mid.htm b/applications/luci-app-olsr/luasrc/view/status-olsr/mid.htm
index 8c9f63af0b..9babd50a80 100644
--- a/applications/luci-app-olsr/luasrc/view/status-olsr/mid.htm
+++ b/applications/luci-app-olsr/luasrc/view/status-olsr/mid.htm
@@ -31,14 +31,14 @@ local i = 1
 				end
 				aliases = v.ipAddress .. sep .. aliases
 			end
-			local host = mid.ipAddress
+			local host = mid.main.ipAddress
 			if mid.proto == '6' then
-				host = '[' .. mid.ipAddress .. ']'
+				host = '[' .. mid.main.ipAddress .. ']'
 			end
 		%>
 
 		<div class="tr cbi-section-table-row cbi-rowstyle-<%=i%> proto-<%=mid.proto%>">
-			<div class="td cbi-section-table-cell"><a href="http://<%=host%>/cgi-bin-status.html"><%=mid.ipAddress%></a></div>
+			<div class="td cbi-section-table-cell"><a href="http://<%=host%>/cgi-bin-status.html"><%=mid.main.ipAddress%></a></div>
 			<div class="td cbi-section-table-cell"><%=aliases%></div>
 		</div>