summaryrefslogtreecommitdiffhomepage
path: root/modules
diff options
context:
space:
mode:
authorSteven Barth <steven@midlink.org>2008-08-13 01:30:32 +0000
committerSteven Barth <steven@midlink.org>2008-08-13 01:30:32 +0000
commita59044df9b87c7e4ce668649726aa2d355206965 (patch)
treec572cae82164b2f3a9ec7f57daf061251d9b0586 /modules
parent07fdaa87dbac0582960cded4e9aa981d4a141782 (diff)
Fixed last commit
Diffstat (limited to 'modules')
-rw-r--r--modules/admin-core/luasrc/tools/webadmin.lua26
-rw-r--r--modules/admin-full/luasrc/model/cbi/admin_network/ifaces.lua3
-rw-r--r--modules/admin-full/luasrc/model/cbi/admin_network/network.lua3
3 files changed, 30 insertions, 2 deletions
diff --git a/modules/admin-core/luasrc/tools/webadmin.lua b/modules/admin-core/luasrc/tools/webadmin.lua
new file mode 100644
index 000000000..45bd910ac
--- /dev/null
+++ b/modules/admin-core/luasrc/tools/webadmin.lua
@@ -0,0 +1,26 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+module("luci.tools.webadmin", package.seeall)
+
+function cbi_add_networks(field)
+ luci.model.uci.foreach("network", "interface",
+ function (section)
+ if section[".name"] ~= "loopback" then
+ field:value(section[".name"])
+ end
+ end
+ )
+end \ No newline at end of file
diff --git a/modules/admin-full/luasrc/model/cbi/admin_network/ifaces.lua b/modules/admin-full/luasrc/model/cbi/admin_network/ifaces.lua
index 906563683..681bfcd6d 100644
--- a/modules/admin-full/luasrc/model/cbi/admin_network/ifaces.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_network/ifaces.lua
@@ -13,10 +13,9 @@ You may obtain a copy of the License at
$Id$
]]--
arg[1] = arg[1] or ""
-
m = Map("network", translate("interfaces"), translate("a_n_ifaces1"))
-s = m:section(NamedSection, arg[1], "interface", translate("interfaces"))
+s = m:section(NamedSection, arg[1], "interface")
s.addremove = true
p = s:option(ListValue, "proto", translate("protocol"))
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 c79dc8359..75c9f2818 100644
--- a/modules/admin-full/luasrc/model/cbi/admin_network/network.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_network/network.lua
@@ -52,6 +52,9 @@ end
ipaddr = s:option(DummyValue, "ipaddr", translate("ipaddress"))
ipaddr.stateful = true
+ip6addr = s:option(DummyValue, "ip6addr", translate("ip6address"))
+ip6addr.stateful = true
+
function ipaddr.cfgvalue(self, section)
local ip = self.map:stateget(section, "ipaddr")
local nm = self.map:stateget(section, "netmask")