From: Jo-Philipp Wich <jow@openwrt.org>
Date: Mon, 15 Nov 2010 12:28:25 +0000 (+0000)
Subject: libs/web: add support for exclude property to ifacelist and netlist widgets
X-Git-Tag: 0.10.0~491
X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=commitdiff_plain;h=59e3062cafcef9c6c59603404576da146623f0fb;ds=sidebyside

libs/web: add support for exclude property to ifacelist and netlist widgets
---

diff --git a/libs/web/luasrc/view/cbi/network_ifacelist.htm b/libs/web/luasrc/view/cbi/network_ifacelist.htm
index 5553da6cc..c4d392e9e 100644
--- a/libs/web/luasrc/view/cbi/network_ifacelist.htm
+++ b/libs/web/luasrc/view/cbi/network_ifacelist.htm
@@ -40,7 +40,7 @@ $Id$
 <ul style="margin:0; list-style-type:none">
 	<% for _, iface in ipairs(ifaces) do
 	     local link = iface:adminlink()
-         if not self.nobridges or not iface:is_bridge() then %>
+         if (not self.nobridges or not iface:is_bridge()) and iface:name() ~= self.exclude then %>
 	<li>
 		<input class="cbi-input-<%=self.widget or "radio"%>" onclick="cbi_d_update(this.id)" onchange="cbi_d_update(this.id)"<%=
 			attr("type", self.widget or "radio") ..
diff --git a/libs/web/luasrc/view/cbi/network_netlist.htm b/libs/web/luasrc/view/cbi/network_netlist.htm
index 2d464cc87..46da88fd1 100644
--- a/libs/web/luasrc/view/cbi/network_netlist.htm
+++ b/libs/web/luasrc/view/cbi/network_netlist.htm
@@ -33,7 +33,7 @@ $Id$
 
 <ul style="margin:0; list-style-type:none; text-align:left">
 	<% for _, net in ipairs(networks) do
-	       if net:name() ~= "loopback" then %>
+	       if net:name() ~= "loopback" and net:name() ~= self.exclude then %>
 	<li style="padding:0.25em 0">
 		<input class="cbi-input-radio" onclick="cbi_d_update(this.id)" onchange="cbi_d_update(this.id)"<%=
 			attr("type", self.widget or "radio") ..