From bbca8cda94ccdf2cf4ed115e0b0ff9e4f73b0ff0 Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Tue, 9 Dec 2014 08:44:06 +0100 Subject: [PATCH] [UI] list only non-existing networks when Add network to VM --- ui/scripts/instances.js | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js index 5d431b13df9..22df9d35291 100644 --- a/ui/scripts/instances.js +++ b/ui/scripts/instances.js @@ -2002,13 +2002,30 @@ url: createURL('listNetworks'), data: data1, success: function(json) { + var networkObjs = json.listnetworksresponse.network; + var nicObjs = args.context.instances[0].nic; + var items = []; + + for (var i = 0; i < networkObjs.length; i++) { + var networkObj = networkObjs[i]; + var isNetworkExists = false; + + for (var j = 0; j < nicObjs.length; j++) { + if (nicObjs[j].networkid == networkObj.id) { + isNetworkExists = true; + break; + } + } + + if (!isNetworkExists) { + items.push({ + id: networkObj.id, + description: networkObj.name + }); + } + } args.response.success({ - data: $.map(json.listnetworksresponse.network, function(network) { - return { - id: network.id, - description: network.name - }; - }) + data: items }); } });