summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--i18n/english/luasrc/i18n/default.en.lua1
-rw-r--r--i18n/german/luasrc/i18n/default.de.lua1
-rw-r--r--modules/admin-full/luasrc/model/cbi/admin_network/network.lua9
3 files changed, 11 insertions, 0 deletions
diff --git a/i18n/english/luasrc/i18n/default.en.lua b/i18n/english/luasrc/i18n/default.en.lua
index 6666864cd..ac532743b 100644
--- 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"
+zone = "Zone"
diff --git a/i18n/german/luasrc/i18n/default.de.lua b/i18n/german/luasrc/i18n/default.de.lua
index a58977384..a9c68cfbb 100644
--- 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"
+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 0fffd32b6..228efc42d 100644
--- 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
+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 ""