projects
/
oweals
/
luci.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
58f183a
)
modules/admin-full: Added Firewall-Zone column to network interface overview
author
Steven Barth
<steven@midlink.org>
Wed, 13 Aug 2008 23:14:19 +0000
(23:14 +0000)
committer
Steven Barth
<steven@midlink.org>
Wed, 13 Aug 2008 23:14:19 +0000
(23:14 +0000)
i18n/english/luasrc/i18n/default.en.lua
patch
|
blob
|
history
i18n/german/luasrc/i18n/default.de.lua
patch
|
blob
|
history
modules/admin-full/luasrc/model/cbi/admin_network/network.lua
patch
|
blob
|
history
diff --git
a/i18n/english/luasrc/i18n/default.en.lua
b/i18n/english/luasrc/i18n/default.en.lua
index 6666864cd58c0cbf44dd54b426b96d05001566ae..ac532743bbb4de8b181fcb3ee463431b700e8a69 100644
(file)
--- a/
i18n/english/luasrc/i18n/default.en.lua
+++ b/
i18n/english/luasrc/i18n/default.en.lua
@@
-110,3
+110,4
@@
version = "Version"
webui = "Web UI"
wifi = "Wifi"
webui = "Web UI"
wifi = "Wifi"
+zone = "Zone"
diff --git
a/i18n/german/luasrc/i18n/default.de.lua
b/i18n/german/luasrc/i18n/default.de.lua
index a5897738426c32340000be30daa12ddb9c1839a7..a9c68cfbb1f442769c43efc9926d877e7aeddbfd 100644
(file)
--- a/
i18n/german/luasrc/i18n/default.de.lua
+++ b/
i18n/german/luasrc/i18n/default.de.lua
@@
-110,3
+110,4
@@
version = "Version"
webui = "Weboberfläche"
wifi = "Drahtlos"
webui = "Weboberfläche"
wifi = "Drahtlos"
+zone = "Zone"
\ No newline at end of file
diff --git
a/modules/admin-full/luasrc/model/cbi/admin_network/network.lua
b/modules/admin-full/luasrc/model/cbi/admin_network/network.lua
index 0fffd32b613ec394b066c8773fe3574be7e0e183..228efc42d95d4f710dc5a6c5f2c90c40842322db 100644
(file)
--- a/
modules/admin-full/luasrc/model/cbi/admin_network/network.lua
+++ b/
modules/admin-full/luasrc/model/cbi/admin_network/network.lua
@@
-53,6
+53,15
@@
end
ifname = s:option(DummyValue, "ifname", translate("device"))
ifname.stateful = true
ifname = s:option(DummyValue, "ifname", translate("device"))
ifname.stateful = true
+if luci.model.uci.load("firewall") then
+ zone = s:option(DummyValue, "_zone", translate("zone"))
+
+ function zone.cfgvalue(self, section)
+ local zones = luci.tools.webadmin.network_get_zones(section)
+ return zones and table.concat(zones, ", ") or "-"
+ end
+end
+
hwaddr = s:option(DummyValue, "_hwaddr")
function hwaddr.cfgvalue(self, section)
local ix = self.map:stateget(section, "ifname") or ""
hwaddr = s:option(DummyValue, "_hwaddr")
function hwaddr.cfgvalue(self, section)
local ix = self.map:stateget(section, "ifname") or ""