diff options
| author | pmelange <isprotejesvalkata@gmail.com> | 2018-11-05 16:37:19 +0100 |
|---|---|---|
| committer | pmelange <isprotejesvalkata@gmail.com> | 2018-11-11 19:45:42 +0100 |
| commit | 7fb197c10a0c5b6d3908a6511ead043219be5492 (patch) | |
| tree | dbdaf2bc9d03fab0e5fdbc19bf8177b5b04e774a | |
| parent | 9e7557b60638cc2981f1a837ef0708a1677632b9 (diff) | |
luci-app-olsr: convert mid.htm to new json plugin
Signed-off-by: pmelange <isprotejesvalkata@gmail.com>
| -rw-r--r-- | applications/luci-app-olsr/luasrc/controller/olsr.lua | 2 | ||||
| -rw-r--r-- | applications/luci-app-olsr/luasrc/view/status-olsr/mid.htm | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/applications/luci-app-olsr/luasrc/controller/olsr.lua b/applications/luci-app-olsr/luasrc/controller/olsr.lua index ff4a248da..e2e93d269 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 8c9f63af0..9babd50a8 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> |