summaryrefslogtreecommitdiffhomepage
path: root/applications/luci-fw/luasrc/model
diff options
context:
space:
mode:
authorSteven Barth <steven@midlink.org>2008-10-04 11:43:47 +0000
committerSteven Barth <steven@midlink.org>2008-10-04 11:43:47 +0000
commit5a40e6f1c00013a59ba8655708bc316398746ad5 (patch)
treea63442365686831a0c78b1c56b4fceb08524d1d0 /applications/luci-fw/luasrc/model
parent684fa2052592e3efd5912599f242c79975ce9796 (diff)
Made distinction between INPUT and FORWARD rules less ambiguous
Diffstat (limited to 'applications/luci-fw/luasrc/model')
-rw-r--r--applications/luci-fw/luasrc/model/cbi/luci_fw/traffic.lua2
-rw-r--r--applications/luci-fw/luasrc/model/cbi/luci_fw/trule.lua8
2 files changed, 5 insertions, 5 deletions
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)