luci-base: widgets.js: handle devices or subnets in CBIZoneForwards

Signed-off-by: Jo-Philipp Wich <jo@mein.io>

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 3de1f8258e35301fa7caa3787570ded82496c839..0e023a78b2ec048b9c2b096d3396daa0da2aed0a 100644 (file)
--- a/modules/luci-base/htdocs/luci-static/resources/tools/widgets.js
+++ b/modules/luci-base/htdocs/luci-static/resources/tools/widgets.js
@@ -199,10 +199,16 @@ var CBIZoneForwards = form.DummyValue.extend({
        __name__: 'CBI.ZoneForwards',
 
        load: function(section_id) {
-               return Promise.all([ firewall.getDefaults(), firewall.getZones(), network.getNetworks() ]).then(L.bind(function(dzn) {
-                       this.defaults = dzn[0];
-                       this.zones = dzn[1];
-                       this.networks = dzn[2];
+               return Promise.all([
+                       firewall.getDefaults(),
+                       firewall.getZones(),
+                       network.getNetworks(),
+                       network.getDevices()
+               ]).then(L.bind(function(dznd) {
+                       this.defaults = dznd[0];
+                       this.zones = dznd[1];
+                       this.networks = dznd[2];
+                       this.devices = dznd[3];
 
                        return this.super('load', section_id);
                }, this));
@@ -211,6 +217,8 @@ var CBIZoneForwards = form.DummyValue.extend({
        renderZone: function(zone) {
                var name = zone.getName(),
                    networks = zone.getNetworks(),
+                   devices = zone.getDevices(),
+                   subnets = zone.getSubnets(),
                    ifaces = [];
 
                for (var j = 0; j < networks.length; j++) {
@@ -223,21 +231,39 @@ var CBIZoneForwards = form.DummyValue.extend({
                                'class': 'ifacebadge' + (network.getName() == this.network ? ' ifacebadge-active' : '')
                        }, network.getName() + ': ');
 
-                       var devices = network.isBridge() ? network.getDevices() : L.toArray(network.getDevice());
+                       var subdevs = network.isBridge() ? network.getDevices() : L.toArray(network.getDevice());
 
-                       for (var k = 0; k < devices.length && devices[k]; k++) {
+                       for (var k = 0; k < subdevs.length && subdevs[k]; k++) {
                                span.appendChild(E('img', {
-                                       'title': devices[k].getI18n(),
-                                       'src': L.resource('icons/%s%s.png'.format(devices[k].getType(), devices[k].isUp() ? '' : '_disabled'))
+                                       'title': subdevs[k].getI18n(),
+                                       'src': L.resource('icons/%s%s.png'.format(subdevs[k].getType(), subdevs[k].isUp() ? '' : '_disabled'))
                                }));
                        }
 
-                       if (!devices.length)
+                       if (!subdevs.length)
                                span.appendChild(E('em', _('(empty)')));
 
                        ifaces.push(span);
                }
 
+               for (var i = 0; i < devices.length; i++) {
+                       var device = this.devices.filter(function(dev) { return dev.getName() == devices[i] })[0],
+                           title = device ? device.getI18n() : _('Absent Interface'),
+                           type = device ? device.getType() : 'ethernet',
+                           up = device ? device.isUp() : false;
+
+                       ifaces.push(E('span', { 'class': 'ifacebadge' }, [
+                               E('img', {
+                                       'title': title,
+                                       'src': L.resource('icons/%s%s.png'.format(type, up ? '' : '_disabled'))
+                               }),
+                               device ? device.getName() : devices[i]
+                       ]));
+               }
+
+               if (subnets.length > 0)
+                       ifaces.push(E('span', { 'class': 'ifacebadge' }, [ '{ %s }'.format(subnets.join('; ')) ]));
+
                if (!ifaces.length)
                        ifaces.push(E('span', { 'class': 'ifacebadge' }, E('em', _('(empty)'))));