From a59044df9b87c7e4ce668649726aa2d355206965 Mon Sep 17 00:00:00 2001 From: Steven Barth Date: Wed, 13 Aug 2008 01:30:32 +0000 Subject: [PATCH] Fixed last commit --- modules/admin-core/luasrc/tools/webadmin.lua | 26 +++++++++++++++++++ .../luasrc/model/cbi/admin_network/ifaces.lua | 3 +-- .../model/cbi/admin_network/network.lua | 3 +++ 3 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 modules/admin-core/luasrc/tools/webadmin.lua 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 +Copyright 2008 Jo-Philipp Wich + +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") -- 2.25.1