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

luci-app-mwan3: refactoring member config pages

Browse source 
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
This commit is contained in:
Florian Eckert 2018-01-17 17:10:06 +01:00
parent b4350f21ff
commit d369c80bec
2 changed files with 6 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
applications/luci-app-mwan3/luasrc/model/cbi/mwan/member.lua
View file

@ -1,5 +1,3 @@
-- ------ member configuration ------ --
ds = require "luci.dispatcher" ds = require "luci.dispatcher"
@ -21,7 +19,6 @@ mwan_member = m5:section(TypedSection, "member", nil,
luci.http.redirect(ds.build_url("admin", "network", "mwan", "member", section)) luci.http.redirect(ds.build_url("admin", "network", "mwan", "member", section))
end end
interface = mwan_member:option(DummyValue, "interface", translate("Interface")) interface = mwan_member:option(DummyValue, "interface", translate("Interface"))
interface.rawhtml = true interface.rawhtml = true
function interface.cfgvalue(self, s) function interface.cfgvalue(self, s)
@ -40,5 +37,4 @@ weight = mwan_member:option(DummyValue, "weight", translate("Weight"))
return self.map:get(s, "weight") or "1" return self.map:get(s, "weight") or "1"
end end
return m5 return m5

22
applications/luci-app-mwan3/luasrc/model/cbi/mwan/memberconfig.lua
View file

@ -1,30 +1,20 @@
-- ------ extra functions ------ --
function cbi_add_interface(field)
uci.cursor():foreach("mwan3", "interface",
function (section)
field:value(section[".name"])
end
)
end
-- ------ member configuration ------ --
dsp = require "luci.dispatcher" dsp = require "luci.dispatcher"
arg[1] = arg[1] or "" arg[1] = arg[1] or ""
m5 = Map("mwan3", translatef("MWAN Member Configuration - %s", arg[1])) m5 = Map("mwan3", translatef("MWAN Member Configuration - %s", arg[1]))
m5.redirect = dsp.build_url("admin", "network", "mwan", "member") m5.redirect = dsp.build_url("admin", "network", "mwan", "member")
mwan_member = m5:section(NamedSection, arg[1], "member", "") mwan_member = m5:section(NamedSection, arg[1], "member", "")
mwan_member.addremove = false mwan_member.addremove = false
mwan_member.dynamic = false mwan_member.dynamic = false
interface = mwan_member:option(Value, "interface", translate("Interface")) interface = mwan_member:option(Value, "interface", translate("Interface"))
cbi_add_interface(interface) m5.uci:foreach("mwan3", "interface",
function(s)
interface:value(s['.name'], s['.name'])
end
)
metric = mwan_member:option(Value, "metric", translate("Metric"), metric = mwan_member:option(Value, "metric", translate("Metric"),
translate("Acceptable values: 1-256. Defaults to 1 if not set")) translate("Acceptable values: 1-256. Defaults to 1 if not set"))