Made distinction between INPUT and FORWARD rules less ambiguous

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 660f9706ac266bd07dbe13e06a5830cc1f747e28..b810f13341b420a209c626e2e48db784dd2f60df 100644 (file)
--- a/applications/luci-fw/luasrc/model/cbi/luci_fw/traffic.lua
+++ b/applications/luci-fw/luasrc/model/cbi/luci_fw/traffic.lua
@@ -67,7 +67,7 @@ end
 dest = s:option(DummyValue, "dest", translate("fw_dest"))
 function dest.cfgvalue(self, s)
        return "%s:%s:%s" % {
-               self.map:get(s, "dest") or "*",
+               self.map:get(s, "dest") or translate("device", "device"),
                self.map:get(s, "dest_ip") or "0.0.0.0/0",
                self.map:get(s, "dest_port") or "*"
        } 

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 2538c1be4047b48d8fc3adcc0e2b25e87fbee4fd..fa5b44e79eb44ddcdfc0b0a7136b2f18acb76771 100644 (file)
--- a/applications/luci-fw/luasrc/model/cbi/luci_fw/trule.lua
+++ b/applications/luci-fw/luasrc/model/cbi/luci_fw/trule.lua
@@ -25,12 +25,12 @@ back.titleref = luci.dispatcher.build_url("admin", "network", "firewall", "traff
 name = s:option(Value, "_name", translate("name")..translate("cbi_optional"))
 name.rmempty = true
 
-iface = s:option(ListValue, "src", translate("firewall_rule_src"))
+iface = s:option(ListValue, "src", translate("fw_src"))
 iface.rmempty = true
 
-oface = s:option(ListValue, "dest", translate("firewall_rule_dest"))
-oface:value("")
-oface.optional = true
+oface = s:option(ListValue, "dest", translate("fw_dest"))
+oface:value("", translate("device", "device"))
+oface.rmempty = true
 
 luci.model.uci.cursor():foreach("firewall", "zone",
        function (section)