Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

luci-app-mwan3: fix unify luci code styling

Browse source 
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
This commit is contained in:
Florian Eckert 2018-01-18 07:41:41 +01:00
parent 831bd71eb3
commit 278b3f53db
8 changed files with 308 additions and 316 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua
View file

@ -105,7 +105,6 @@ end
m5 = Map("mwan3", translate("MWAN - Interfaces"), m5 = Map("mwan3", translate("MWAN - Interfaces"),
interfaceWarnings(configCheck())) interfaceWarnings(configCheck()))
mwan_interface = m5:section(TypedSection, "interface", nil, mwan_interface = m5:section(TypedSection, "interface", nil,
translate("MWAN supports up to 250 physical and/or logical interfaces<br />" .. translate("MWAN supports up to 250 physical and/or logical interfaces<br />" ..
"MWAN requires that all interfaces have a unique metric configured in /etc/config/network<br />" .. "MWAN requires that all interfaces have a unique metric configured in /etc/config/network<br />" ..
@ -124,7 +123,6 @@ mwan_interface = m5:section(TypedSection, "interface", nil,
luci.http.redirect(dsp.build_url("admin", "network", "mwan", "interface", section)) luci.http.redirect(dsp.build_url("admin", "network", "mwan", "interface", section))
end end
enabled = mwan_interface:option(DummyValue, "enabled", translate("Enabled")) enabled = mwan_interface:option(DummyValue, "enabled", translate("Enabled"))
enabled.rawhtml = true enabled.rawhtml = true
function enabled.cfgvalue(self, s) function enabled.cfgvalue(self, s)

2
applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua
View file

@ -5,12 +5,10 @@ arg[1] = arg[1] or ""
m5 = Map("mwan3", translatef("MWAN Interface Configuration - %s", arg[1])) m5 = Map("mwan3", translatef("MWAN Interface Configuration - %s", arg[1]))
m5.redirect = dsp.build_url("admin", "network", "mwan", "interface") m5.redirect = dsp.build_url("admin", "network", "mwan", "interface")
mwan_interface = m5:section(NamedSection, arg[1], "interface", "") mwan_interface = m5:section(NamedSection, arg[1], "interface", "")
mwan_interface.addremove = false mwan_interface.addremove = false
mwan_interface.dynamic = false mwan_interface.dynamic = false
enabled = mwan_interface:option(ListValue, "enabled", translate("Enabled")) enabled = mwan_interface:option(ListValue, "enabled", translate("Enabled"))
enabled.default = "1" enabled.default = "1"
enabled:value("1", translate("Yes")) enabled:value("1", translate("Yes"))

2
applications/luci-app-mwan3/luasrc/model/cbi/mwan/policy.lua
View file

@ -32,7 +32,6 @@ end
m5 = Map("mwan3", translate("MWAN - Policies"), m5 = Map("mwan3", translate("MWAN - Policies"),
policyError(policyCheck())) policyError(policyCheck()))
mwan_policy = m5:section(TypedSection, "policy", nil, mwan_policy = m5:section(TypedSection, "policy", nil,
translate("Policies are profiles grouping one or more members controlling how MWAN distributes traffic<br />" .. translate("Policies are profiles grouping one or more members controlling how MWAN distributes traffic<br />" ..
"Member interfaces with lower metrics are used first. Interfaces with the same metric load-balance<br />" .. "Member interfaces with lower metrics are used first. Interfaces with the same metric load-balance<br />" ..
@ -51,7 +50,6 @@ mwan_policy = m5:section(TypedSection, "policy", nil,
luci.http.redirect(dsp.build_url("admin", "network", "mwan", "policy", section)) luci.http.redirect(dsp.build_url("admin", "network", "mwan", "policy", section))
end end
use_member = mwan_policy:option(DummyValue, "use_member", translate("Members assigned")) use_member = mwan_policy:option(DummyValue, "use_member", translate("Members assigned"))
use_member.rawhtml = true use_member.rawhtml = true
function use_member.cfgvalue(self, s) function use_member.cfgvalue(self, s)

1
applications/luci-app-mwan3/luasrc/model/cbi/mwan/rule.lua
View file

@ -60,7 +60,6 @@ mwan_rule = m5:section(TypedSection, "rule", nil,
luci.http.redirect(dsp.build_url("admin", "network", "mwan", "rule", section)) luci.http.redirect(dsp.build_url("admin", "network", "mwan", "rule", section))
end end
src_ip = mwan_rule:option(DummyValue, "src_ip", translate("Source address")) src_ip = mwan_rule:option(DummyValue, "src_ip", translate("Source address"))
src_ip.rawhtml = true src_ip.rawhtml = true
function src_ip.cfgvalue(self, s) function src_ip.cfgvalue(self, s)

1
applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua
View file

@ -9,7 +9,6 @@ mwan_rule = m5:section(NamedSection, arg[1], "rule", "")
mwan_rule.addremove = false mwan_rule.addremove = false
mwan_rule.dynamic = false mwan_rule.dynamic = false
src_ip = mwan_rule:option(Value, "src_ip", translate("Source address"), src_ip = mwan_rule:option(Value, "src_ip", translate("Source address"),
translate("Supports CIDR notation (eg \"192.168.100.0/24\") without quotes")) translate("Supports CIDR notation (eg \"192.168.100.0/24\") without quotes"))
src_ip.datatype = ipaddr src_ip.datatype = ipaddr