[applications] luci-multiwan: relocated default route selection to bottom of configur...

diff --git a/applications/luci-multiwan/luasrc/model/cbi/multiwan/multiwan.lua b/applications/luci-multiwan/luasrc/model/cbi/multiwan/multiwan.lua
index 3494ac74a59a9fe8b249f118912609b80518bff9..b17b940a050ca75e7e891eb5acc8ef08d417b9db 100644 (file)
--- a/applications/luci-multiwan/luasrc/model/cbi/multiwan/multiwan.lua
+++ b/applications/luci-multiwan/luasrc/model/cbi/multiwan/multiwan.lua
@@ -19,14 +19,6 @@ function e.cfgvalue(self, section)
         return (os.execute("/etc/init.d/multiwan enabled") == 0) and "1" or "0"
 end
 
-default_route = s:option(ListValue, "default_route", translate("Default Route"))
-luci.tools.webadmin.cbi_add_networks(default_route)
-default_route:value("fastbalancer", translate("Fast Balancer"))
-default_route:value("balancer", translate("Load Balancer"))
-default_route.default = "balancer"
-default_route.optional = false
-default_route.rmempty = false
-
 s = m:section(TypedSection, "interface", translate("WAN Interfaces"),
        translate("Health Monitor detects and corrects network changes and failed connections."))
 s.addremove = true
@@ -150,4 +142,15 @@ wanrule.default = "fastbalancer"
 wanrule.optional = false
 wanrule.rmempty = false
 
+s = m:section(NamedSection, "config", "", "")
+s.addremove = false
+
+default_route = s:option(ListValue, "default_route", translate("Default Route"))
+luci.tools.webadmin.cbi_add_networks(default_route)
+default_route:value("fastbalancer", translate("Fast Balancer"))
+default_route:value("balancer", translate("Load Balancer"))
+default_route.default = "balancer"
+default_route.optional = false
+default_route.rmempty = false
+
 return m

diff --git a/applications/luci-multiwan/luasrc/model/cbi/multiwan/multiwanmini.lua b/applications/luci-multiwan/luasrc/model/cbi/multiwan/multiwanmini.lua
index 829ecda451d4f4bd3f70829181ca9aec77a52283..18c052df24435e2b5a5684fb7ae709138b2d30d6 100644 (file)
--- a/applications/luci-multiwan/luasrc/model/cbi/multiwan/multiwanmini.lua
+++ b/applications/luci-multiwan/luasrc/model/cbi/multiwan/multiwanmini.lua
@@ -19,14 +19,6 @@ function e.cfgvalue(self, section)
         return (os.execute("/etc/init.d/multiwan enabled") == 0) and "1" or "0"
 end
 
-default_route = s:option(ListValue, "default_route", translate("Default Route"))
-luci.tools.webadmin.cbi_add_networks(default_route)
-default_route:value("fastbalancer", translate("Fast Balancer"))
-default_route:value("balancer", translate("Load Balancer"))
-default_route.default = "balancer"
-default_route.optional = false
-default_route.rmempty = false
-
 s = m:section(TypedSection, "mwanfw", translate("Multi-WAN Traffic Rules"),
        translate("Configure rules for directing outbound traffic through specified WAN Uplinks."))
 s.template = "cbi/tblsection"
@@ -62,4 +54,15 @@ wanrule.default = "fastbalancer"
 wanrule.optional = false
 wanrule.rmempty = false
 
+s = m:section(NamedSection, "config", "", "")
+s.addremove = false
+
+default_route = s:option(ListValue, "default_route", translate("Default Route"))
+luci.tools.webadmin.cbi_add_networks(default_route)
+default_route:value("fastbalancer", translate("Fast Balancer"))
+default_route:value("balancer", translate("Load Balancer"))
+default_route.default = "balancer"
+default_route.optional = false
+default_route.rmempty = false
+
 return m