From ce23f29e251b31cd4f3db7460015b7416ed4526c Mon Sep 17 00:00:00 2001 From: Brian Federle Date: Thu, 9 Aug 2012 11:43:01 -0700 Subject: [PATCH] CS-15916: Show network name in IP details --- ui/scripts/network.js | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/ui/scripts/network.js b/ui/scripts/network.js index 9bea5e0d78f..b164849cb99 100644 --- a/ui/scripts/network.js +++ b/ui/scripts/network.js @@ -1659,6 +1659,7 @@ }, { id: { label: 'label.id' }, + networkname: { label: 'label.network.name' }, networkid: { label: 'label.network.id' }, associatednetworkid: { label: 'label.associated.network.id' }, state: { label: 'label.state' }, @@ -1691,10 +1692,19 @@ success: function(json) { var ipObj = json.listpublicipaddressesresponse.publicipaddress[0]; getExtaPropertiesForIpObj(ipObj, args); + + var network = $.grep( + args.context.vpc ? + args.context.vpc[0].network : args.context.networks, + function(network) { + return network.id = ipObj.networkid; + })[0]; args.response.success({ actionFilter: actionFilters.ipAddress, - data: ipObj + data: $.extend(ipObj, { + networkname: network.name + }) }); }, error: function(data) {