Merge pull request #1735 from sumpfralle/olsr-jsoninfo-parser-handle-empty-result

[oweals/luci.git] / modules / luci-base / htdocs / luci-static / resources / tools / widgets.js

diff --git a/modules/luci-base/htdocs/luci-static/resources/tools/widgets.js b/modules/luci-base/htdocs/luci-static/resources/tools/widgets.js
index 2da9e7435ffaa7fd05f347332471e7b5b92a0b24..1667fa670726d5f95719c385840320f6e85ef4e3 100644 (file)
--- a/modules/luci-base/htdocs/luci-static/resources/tools/widgets.js
+++ b/modules/luci-base/htdocs/luci-static/resources/tools/widgets.js
@@ -358,7 +358,7 @@ var CBINetworkSelect = form.ListValue.extend({
                        var network = this.networks[i],
                            name = network.getName();
 
-                       if (name == 'loopback' || !this.filter(section_id, name))
+                       if (name == 'loopback' || name == this.exclude || !this.filter(section_id, name))
                                continue;
 
                        if (this.novirtual && network.isVirtual())
@@ -478,7 +478,7 @@ var CBIDeviceSelect = form.ListValue.extend({
                        var networks = device.getNetworks();
 
                        if (networks.length > 0)
-                               L.dom.append(item.lastChild, [ ' (', networks.join(', '), ')' ]);
+                               L.dom.append(item.lastChild, [ ' (', networks.map(function(n) { return n.getName() }).join(', '), ')' ]);
 
                        if (checked[name])
                                values.push(name);