From: Steven Barth Date: Fri, 9 Jan 2009 10:05:19 +0000 (+0000) Subject: Firewall GUI optimizations X-Git-Tag: 0.9.0~820 X-Git-Url: http://git.openwrt.org/?p=project%2Fluci.git;a=commitdiff_plain;h=25d9dc415f05bb8e535ccf3d4f3abdf67d2d9e72 Firewall GUI optimizations --- diff --git a/applications/luci-fw/luasrc/model/cbi/luci_fw/rrule.lua b/applications/luci-fw/luasrc/model/cbi/luci_fw/rrule.lua index 9c40d958f5..d3fc589f89 100644 --- a/applications/luci-fw/luasrc/model/cbi/luci_fw/rrule.lua +++ b/applications/luci-fw/luasrc/model/cbi/luci_fw/rrule.lua @@ -40,7 +40,6 @@ s:option(Value, "src_ip", translate("firewall_redirect_srcip")).optional = true s:option(Value, "src_mac", translate("firewall_redirect_srcmac")).optional = true sport = s:option(Value, "src_port", translate("firewall_redirect_srcport")) -sport.optional = true sport:depends("proto", "tcp") sport:depends("proto", "udp") sport:depends("proto", "tcpudp") @@ -54,7 +53,6 @@ proto:value("tcpudp", "TCP+UDP") dport = s:option(Value, "src_dport", translate("firewall_redirect_srcdport")) dport.size = 5 -dport.optional = true dport:depends("proto", "tcp") dport:depends("proto", "udp") dport:depends("proto", "tcpudp") diff --git a/applications/luci-fw/luasrc/model/cbi/luci_fw/trule.lua b/applications/luci-fw/luasrc/model/cbi/luci_fw/trule.lua index 72a36f9271..c7aab0f5bb 100644 --- a/applications/luci-fw/luasrc/model/cbi/luci_fw/trule.lua +++ b/applications/luci-fw/luasrc/model/cbi/luci_fw/trule.lua @@ -52,13 +52,11 @@ s:option(Value, "dest_ip", translate("firewall_rule_destip")).optional = true s:option(Value, "src_mac", translate("firewall_rule_srcmac")).optional = true sport = s:option(Value, "src_port", translate("firewall_rule_srcport")) -sport.optional = true sport:depends("proto", "tcp") sport:depends("proto", "udp") sport:depends("proto", "tcpudp") dport = s:option(Value, "dest_port", translate("firewall_rule_destport")) -dport.optional = true dport:depends("proto", "tcp") dport:depends("proto", "udp") dport:depends("proto", "tcpudp")