follouwp: code cleanup for bond_mode_array

[proxmox-widget-toolkit.git] / node / NetworkView.js

diff --git a/node/NetworkView.js b/node/NetworkView.js
index b38a07ef538bb1a3fc7a69c52f7711ec6bfca437..af2da87447b7b3d5ce3e604a28473d54daaf7f80 100644 (file)
--- a/node/NetworkView.js
+++ b/node/NetworkView.js
@@ -5,6 +5,7 @@ Ext.define('proxmox-networks', {
        'bridge_ports', 'slaves',
        'address', 'netmask', 'gateway',
        'address6', 'netmask6', 'gateway6',
+       'cidr', 'cidr6',
        'comments'
     ],
     idProperty: 'iface'
@@ -224,6 +225,19 @@ Ext.define('Proxmox.node.NetworkView', {
            );
        }
 
+       var renderer_generator = function(fieldname) {
+           return function(val, metaData, rec) {
+               var tmp = [];
+               if (rec.data[fieldname]) {
+                   tmp.push(rec.data[fieldname]);
+               }
+               if (rec.data[fieldname + '6']) {
+                   tmp.push(rec.data[fieldname + '6']);
+               }
+               return tmp.join('<br>') || '';
+           };
+       };
+
        Ext.apply(me, {
            layout: 'border',
            tbar: [
@@ -309,42 +323,45 @@ Ext.define('Proxmox.node.NetworkView', {
                            dataIndex: 'type',
                            renderer: render_ports
                        },
+                       {
+                           header: gettext('Bond Mode'),
+                           dataIndex: 'bond_mode',
+                           renderer: Proxmox.Utils.render_bond_mode,
+                       },
+                       {
+                           header: gettext('Hash Policy'),
+                           hidden: true,
+                           dataIndex: 'bond_xmit_hash_policy',
+                       },
                        {
                            header: gettext('IP address'),
                            sortable: true,
                            width: 120,
+                           hidden: true,
                            dataIndex: 'address',
-                           renderer: function(value, metaData, rec) {
-                               if (rec.data.address && rec.data.address6) {
-                                   return rec.data.address + "<br>"
-                                          + rec.data.address6 + '/' + rec.data.netmask6;
-                               } else if (rec.data.address6) {
-                                   return rec.data.address6 + '/' + rec.data.netmask6;
-                               } else {
-                                   return rec.data.address;
-                               }
-                           }
+                           renderer: renderer_generator('address'),
                        },
                        {
                            header: gettext('Subnet mask'),
                            width: 120,
                            sortable: true,
-                           dataIndex: 'netmask'
+                           hidden: true,
+                           dataIndex: 'netmask',
+                           renderer: renderer_generator('netmask'),
+                       },
+                       {
+                           header: gettext('CIDR'),
+                           width: 120,
+                           sortable: true,
+                           dataIndex: 'cidr',
+                           renderer: renderer_generator('cidr'),
                        },
                        {
                            header: gettext('Gateway'),
                            width: 120,
                            sortable: true,
                            dataIndex: 'gateway',
-                           renderer: function(value, metaData, rec) {
-                               if (rec.data.gateway && rec.data.gateway6) {
-                                   return rec.data.gateway + "<br>" + rec.data.gateway6;
-                               } else if (rec.data.gateway6) {
-                                   return rec.data.gateway6;
-                               } else {
-                                   return rec.data.gateway;
-                               }
-                           }
+                           renderer: renderer_generator('gateway'),
                        },
                        {
                            header: gettext('Comment'),