diff options
Diffstat (limited to 'modules')
5 files changed, 22 insertions, 21 deletions
diff --git a/modules/admin-core/luasrc/tools/webadmin.lua b/modules/admin-core/luasrc/tools/webadmin.lua index 0f7612ff76..fe725d42df 100644 --- a/modules/admin-core/luasrc/tools/webadmin.lua +++ b/modules/admin-core/luasrc/tools/webadmin.lua @@ -57,10 +57,11 @@ function date_format(secs) end function network_get_addresses(net) + luci.model.uci.load_state("network") local addr = {} - local ipv4 = luci.model.uci.get_statevalue("network", net, "ipaddr") - local mav4 = luci.model.uci.get_statevalue("network", net, "netmask") - local ipv6 = luci.model.uci.get_statevalue("network", net, "ip6addr") + local ipv4 = luci.model.uci.get("network", net, "ipaddr") + local mav4 = luci.model.uci.get("network", net, "netmask") + local ipv6 = luci.model.uci.get("network", net, "ip6addr") if ipv4 and mav4 then ipv4 = luci.ip.IPv4(ipv4, mav4) @@ -113,7 +114,7 @@ function cbi_add_knownips(field) end function network_get_zones(net) - if not luci.model.uci.load("firewall") then + if not luci.model.uci.load_state("firewall") then return nil end @@ -146,11 +147,12 @@ function firewall_find_zone(name) end function iface_get_network(iface) + luci.model.uci.load_state("network") local net luci.model.uci.foreach("network", "interface", function (section) - local ifname = luci.model.uci.get_statevalue( + local ifname = luci.model.uci.get( "network", section[".name"], "ifname" ) diff --git a/modules/admin-full/luasrc/controller/admin/uci.lua b/modules/admin-full/luasrc/controller/admin/uci.lua index c06683d716..5dd0aaf6e2 100644 --- a/modules/admin-full/luasrc/controller/admin/uci.lua +++ b/modules/admin-full/luasrc/controller/admin/uci.lua @@ -65,7 +65,7 @@ function action_apply() for r, tbl in pairs(changes) do if r then if path[#path] ~= "apply" then - luci.model.uci.load(r) + luci.model.uci.load_config(r) luci.model.uci.commit(r) luci.model.uci.unload(r) end @@ -93,7 +93,7 @@ function action_revert() -- Collect files to be reverted for r, tbl in pairs(changes) do - luci.model.uci.load(r) + luci.model.uci.load_config(r) luci.model.uci.revert(r) luci.model.uci.unload(r) end diff --git a/modules/admin-full/luasrc/model/cbi/admin_network/network.lua b/modules/admin-full/luasrc/model/cbi/admin_network/network.lua index d2ccb9b95e..d4f95b8f69 100644 --- a/modules/admin-full/luasrc/model/cbi/admin_network/network.lua +++ b/modules/admin-full/luasrc/model/cbi/admin_network/network.lua @@ -17,6 +17,7 @@ require("luci.tools.webadmin") m = Map("network", translate("interfaces")) +m.stateful = true local created local netstat = luci.sys.net.deviceinfo() @@ -44,14 +45,12 @@ function s.parse(self, ...) end up = s:option(Flag, "up") -up.stateful = true function up.write(self, section, value) local call = value == "1" and "ifdown" or "ifup" os.execute(call .. " " .. section) end ifname = s:option(DummyValue, "ifname", translate("device")) -ifname.stateful = true ifname.titleref = luci.dispatcher.build_url("admin", "network", "vlan") if luci.model.uci.load("firewall") then @@ -66,7 +65,7 @@ end hwaddr = s:option(DummyValue, "_hwaddr") function hwaddr.cfgvalue(self, section) - local ix = self.map:stateget(section, "ifname") or "" + local ix = self.map:get(section, "ifname") or "" return luci.fs.readfile("/sys/class/net/" .. ix .. "/address") or "n/a" end @@ -81,7 +80,7 @@ end txrx = s:option(DummyValue, "_txrx") function txrx.cfgvalue(self, section) - local ix = self.map:stateget(section, "ifname") + local ix = self.map:get(section, "ifname") local rx = netstat and netstat[ix] and netstat[ix][1] rx = rx and luci.tools.webadmin.byte_format(tonumber(rx)) or "-" @@ -95,7 +94,7 @@ end errors = s:option(DummyValue, "_err") function errors.cfgvalue(self, section) - local ix = self.map:stateget(section, "ifname") + local ix = self.map:get(section, "ifname") local rx = netstat and netstat[ix] and netstat[ix][3] local tx = netstat and netstat[ix] and netstat[ix][11] diff --git a/modules/admin-mini/luasrc/controller/mini/uci.lua b/modules/admin-mini/luasrc/controller/mini/uci.lua index 5ba4f2949e..9b57fe31ab 100644 --- a/modules/admin-mini/luasrc/controller/mini/uci.lua +++ b/modules/admin-mini/luasrc/controller/mini/uci.lua @@ -63,7 +63,7 @@ function action_apply() -- Collect files to be applied and commit changes for r, tbl in pairs(changes) do if r then - luci.model.uci.load(r) + luci.model.uci.load_config(r) luci.model.uci.commit(r) luci.model.uci.unload(r) if luci.config.uci_oncommit and luci.config.uci_oncommit[r] then @@ -90,7 +90,7 @@ function action_revert() -- Collect files to be reverted for r, tbl in pairs(changes) do - luci.model.uci.load(r) + luci.model.uci.load_config(r) luci.model.uci.revert(r) luci.model.uci.unload(r) end diff --git a/modules/admin-mini/luasrc/model/cbi/mini/index.lua b/modules/admin-mini/luasrc/model/cbi/mini/index.lua index eb7d77eb17..5ce9dfcd99 100644 --- a/modules/admin-mini/luasrc/model/cbi/mini/index.lua +++ b/modules/admin-mini/luasrc/model/cbi/mini/index.lua @@ -47,6 +47,7 @@ f:field(DummyValue, "_uptime", translate("m_i_uptime")).value = m = Map("network", translate("interfaces")) +m.stateful = true local netstat = luci.sys.net.deviceinfo() m.parse = function() end @@ -60,21 +61,20 @@ end hwaddr = s:option(DummyValue, "_hwaddr") function hwaddr.cfgvalue(self, section) - local ix = self.map:stateget(section, "ifname") or "" + local ix = self.map:get(section, "ifname") or "" return luci.fs.readfile("/sys/class/net/" .. ix .. "/address") or "n/a" end -ipaddr = s:option(DummyValue, "ipaddr", translate("ipaddress")) -ipaddr.stateful = true +s:option(DummyValue, "ipaddr", translate("ipaddress")) + +s:option(DummyValue, "netmask", translate("netmask")) -ipaddr = s:option(DummyValue, "netmask", translate("netmask")) -ipaddr.stateful = true txrx = s:option(DummyValue, "_txrx") function txrx.cfgvalue(self, section) - local ix = self.map:stateget(section, "ifname") + local ix = self.map:get(section, "ifname") local rx = netstat and netstat[ix] and netstat[ix][1] rx = rx and luci.tools.webadmin.byte_format(tonumber(rx)) or "-" @@ -88,7 +88,7 @@ end errors = s:option(DummyValue, "_err") function errors.cfgvalue(self, section) - local ix = self.map:stateget(section, "ifname") + local ix = self.map:get(section, "ifname") local rx = netstat and netstat[ix] and netstat[ix][3] local tx = netstat and netstat[ix] and netstat[ix][11] |