From: Jo-Philipp Wich Date: Wed, 14 Sep 2011 09:28:16 +0000 (+0000) Subject: libs/web: track submit state in network_ifacelist widget, fixes deselecting all membe... X-Git-Tag: 0.11.0~1767 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=537c929d636b1f147e23c2f21c56e3f8bf6f7534;p=project%2Fluci.git libs/web: track submit state in network_ifacelist widget, fixes deselecting all member ifaces in checkbox mode --- diff --git a/libs/web/luasrc/view/cbi/network_ifacelist.htm b/libs/web/luasrc/view/cbi/network_ifacelist.htm index a1b9f74513..192bcac729 100644 --- a/libs/web/luasrc/view/cbi/network_ifacelist.htm +++ b/libs/web/luasrc/view/cbi/network_ifacelist.htm @@ -3,12 +3,15 @@ <%- local utl = require "luci.util" local net = require "luci.model.network".init() + local cbeid = luci.cbi.FEXIST_PREFIX .. self.config .. "." .. section .. "." .. self.option local iface local ifaces = net:get_interfaces() - local value = self:formvalue(section) - - if not value or value == "" then + local value + + if self.map:formvalue(cbeid) == "1" then + value = self:formvalue(section) or self.default or "" + else value = self:cfgvalue(section) or self.default end @@ -29,6 +32,7 @@ end -%> +