From: Steven Barth <steven@midlink.org>
Date: Sat, 4 Oct 2008 11:43:47 +0000 (+0000)
Subject: Made distinction between INPUT and FORWARD rules less ambiguous
X-Git-Tag: 0.9.0~1151
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=5a40e6f1c00013a59ba8655708bc316398746ad5;p=oweals%2Fluci.git

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 660f9706a..b810f1334 100644
--- 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 2538c1be4..fa5b44e79 100644
--- 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)