From 547972eed5a861441c4e80907bc980bb63451a12 Mon Sep 17 00:00:00 2001
From: Brian Federle <brian@cloud.com>
Date: Tue, 6 Dec 2011 12:19:26 -0800
Subject: [PATCH] bug 12288: Add more fields to network list view/detail view

-Added Network type field
-Added VLAN ID field (from broadcasturi)
---
 ui/scripts/network.js | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/ui/scripts/network.js b/ui/scripts/network.js
index 42880dae1a7..dadfd0ae620 100644
--- a/ui/scripts/network.js
+++ b/ui/scripts/network.js
@@ -73,9 +73,19 @@
           },
           fields: {
             name: { label: 'Name' },
+            type: { label: 'Type' },
             traffictype: { label: 'Traffic Type' },
             gateway: { label: 'Gateway' },
-            vlan: { label: 'VLAN' }
+            broadcasturi: {
+              label: 'VLAN',
+              converter: function(value) {
+                if (value)
+                  return value.split('vlan://')[1];
+
+                return 'Untagged';
+              }
+            },
+            state: { label: 'State', indicator: { 'Setup': 'on' } }
           },
           dataProvider: function(args) {
             $.ajax({
@@ -104,7 +114,7 @@
                     name: { label: 'Name' }
                   },
                   {
-                    name: { label: 'Short name' },
+                    type: { label: 'Type' },
                     displaytext: { label: 'Description' },
                     traffictype: { label: 'Traffic Type' },
                     gateway: { label: 'Gateway' },