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 9c40d958f568d72eff4d1c94baf0ac1a820044b9..d3fc589f892f66762137680a8b528d47a49740e1 100644 (file)
--- 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 72a36f92712c62987c322498f6f4c1aaebf4e58a..c7aab0f5bba5784f70dd21021e897161a77e1e39 100644 (file)
--- 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")