luci-app-olsr: handle empty result for non-status tables

[oweals/luci.git] / modules / luci-mod-network / luasrc / model / cbi / admin_network / ifaces.lua

diff --git a/modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua b/modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua
index 8be354b448c17a4c2a943b86c8e0661ab43fea85..de7b8676e8f1d83e8da555c32112626f07909d4d 100644 (file)
--- a/modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua
+++ b/modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua
@@ -226,8 +226,8 @@ if not net:is_installed() then
 
        function p_install.write()
                return luci.http.redirect(
-                       luci.dispatcher.build_url("admin/system/packages") ..
-                       "?submit=1&install=%s" % net:opkg_package()
+                       luci.dispatcher.build_url("admin/system/opkg") ..
+                       "?query=%s" % net:opkg_package()
                )
        end
 end
@@ -247,7 +247,7 @@ for _, pr in ipairs(nw:get_protocols()) do
 end
 
 
-auto = s:taboption("advanced", Flag, "auto", translate("Bring up on boot"))
+auto = s:taboption("general", Flag, "auto", translate("Bring up on boot"))
 auto.default = (net:proto() == "none") and auto.disabled or auto.enabled
 
 delegate = s:taboption("advanced", Flag, "delegate", translate("Use builtin IPv6-management"))
@@ -284,7 +284,7 @@ if not net:is_floating() then
        ifname_single = s:taboption("physical", Value, "ifname_single", translate("Interface"))
        ifname_single.template = "cbi/network_ifacelist"
        ifname_single.widget = "radio"
-       ifname_single.nobridges = true
+       ifname_single.nobridges = net:is_bridge()
        ifname_single.noaliases = false
        ifname_single.rmempty = false
        ifname_single.network = arg[1]
@@ -341,7 +341,7 @@ end
 if not net:is_virtual() then
        ifname_multi = s:taboption("physical", Value, "ifname_multi", translate("Interface"))
        ifname_multi.template = "cbi/network_ifacelist"
-       ifname_multi.nobridges = true
+       ifname_multi.nobridges = net:is_bridge()
        ifname_multi.noaliases = true
        ifname_multi.rmempty = false
        ifname_multi.network = arg[1]