luci-mod-admin-full: fix device selection in wireless and bandwidth realtime stats

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_status/bandwidth.htm b/modules/luci-mod-admin-full/luasrc/view/admin_status/bandwidth.htm
index 04da3c1..33bbee7 100644 (file)
--- a/modules/luci-mod-admin-full/luasrc/view/admin_status/bandwidth.htm
+++ b/modules/luci-mod-admin-full/luasrc/view/admin_status/bandwidth.htm
@@ -14,8 +14,7 @@
                end
        end
 
                end
        end
 

-       local curdev = luci.dispatcher.context.requestpath
-             curdev = curdev[#curdev] ~= "bandwidth" and curdev[#curdev] or devices[1]
+       local curdev = luci.http.formvalue("dev") or devices[1]

 -%>
 
 <%+header%>
 -%>
 
 <%+header%>


@@ -268,7 +267,7 @@
 
 <ul class="cbi-tabmenu">
        <% for _, dev in ipairs(devices) do %>
 
 <ul class="cbi-tabmenu">
        <% for _, dev in ipairs(devices) do %>

-               <li class="cbi-tab<%= dev == curdev and "" or "-disabled" %>"><a href="<%=pcdata(dev)%>"><%=pcdata(dev)%></a></li>
+               <li class="cbi-tab<%= dev == curdev and "" or "-disabled" %>"><a href="?dev=<%=pcdata(dev)%>"><%=pcdata(dev)%></a></li>

        <% end %>
 </ul>
 
        <% end %>
 </ul>
 

diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_status/wireless.htm b/modules/luci-mod-admin-full/luasrc/view/admin_status/wireless.htm
index f185926..aa658ff 100644 (file)
--- a/modules/luci-mod-admin-full/luasrc/view/admin_status/wireless.htm
+++ b/modules/luci-mod-admin-full/luasrc/view/admin_status/wireless.htm
@@ -14,8 +14,7 @@
                end
        end
 
                end
        end
 

-       local curdev = luci.dispatcher.context.requestpath
-             curdev = curdev[#curdev] ~= "wireless" and curdev[#curdev] or devices[1]
+       local curdev = luci.http.formvalue("dev") or devices[1]

 -%>
 
 <%+header%>
 -%>
 
 <%+header%>


@@ -318,7 +317,7 @@
 
 <ul class="cbi-tabmenu">
        <% for _, dev in ipairs(devices) do %>
 
 <ul class="cbi-tabmenu">
        <% for _, dev in ipairs(devices) do %>

-               <li class="cbi-tab<%= dev == curdev and "" or "-disabled" %>"><a href="<%=pcdata(dev)%>"><%=pcdata(dev)%></a></li>
+               <li class="cbi-tab<%= dev == curdev and "" or "-disabled" %>"><a href="?dev=<%=pcdata(dev)%>"><%=pcdata(dev)%></a></li>

        <% end %>
 </ul>
 
        <% end %>
 </ul>