From: Jo-Philipp Wich Date: Mon, 8 Mar 2010 02:34:12 +0000 (+0000) Subject: luci-0.9: merge r5597 X-Git-Tag: 0.9.0~61 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a88531779f9da7fc1af281acf54d8d0e4cc30d75;p=oweals%2Fluci.git luci-0.9: merge r5597 --- diff --git a/applications/luci-fw/luasrc/model/cbi/luci_fw/traffic.lua b/applications/luci-fw/luasrc/model/cbi/luci_fw/traffic.lua index c3efdd855..eaddfa2d9 100644 --- a/applications/luci-fw/luasrc/model/cbi/luci_fw/traffic.lua +++ b/applications/luci-fw/luasrc/model/cbi/luci_fw/traffic.lua @@ -21,7 +21,6 @@ s.anonymous = true iface = s:option(ListValue, "src", translate("fw_src")) oface = s:option(ListValue, "dest", translate("fw_dest")) -s:option(Flag, "mtu_fix", translate("fw_mtufix")) luci.model.uci.cursor():foreach("firewall", "zone", function (section) @@ -79,4 +78,4 @@ end s:option(DummyValue, "target") -return m \ No newline at end of file +return m diff --git a/applications/luci-fw/luasrc/model/cbi/luci_fw/zones.lua b/applications/luci-fw/luasrc/model/cbi/luci_fw/zones.lua index 46bd636b2..45ee40488 100644 --- a/applications/luci-fw/luasrc/model/cbi/luci_fw/zones.lua +++ b/applications/luci-fw/luasrc/model/cbi/luci_fw/zones.lua @@ -58,6 +58,7 @@ for i, v in ipairs(p) do end s:option(Flag, "masq") +s:option(Flag, "mtu_fix", translate("fw_mtufix")) net = s:option(MultiValue, "network") net.widget = "select"