Multiple NICs UI: Fix list view data
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/4469e6b8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/4469e6b8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/4469e6b8 Branch: refs/heads/Health-Check-UI Commit: 4469e6b859f1f6ed690151b185f7aaf29884d806 Parents: 2f03e55 Author: Brian Federle <brian.fede...@citrix.com> Authored: Wed Mar 6 11:26:38 2013 -0800 Committer: Brian Federle <brian.fede...@citrix.com> Committed: Wed Mar 6 11:26:38 2013 -0800 ---------------------------------------------------------------------- ui/scripts/network.js | 30 ++++++++++++++++++++---------- 1 files changed, 20 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/4469e6b8/ui/scripts/network.js ---------------------------------------------------------------------- diff --git a/ui/scripts/network.js b/ui/scripts/network.js index 5d9966f..f685c9c 100755 --- a/ui/scripts/network.js +++ b/ui/scripts/network.js @@ -620,7 +620,7 @@ var data = { id: args.context.networks[0].id, name: args.data.name, - displaytext: args.data.displaytext, + displaytext: args.data.displaytext }; //args.data.networkdomain is null when networkdomain field is hidden @@ -628,13 +628,13 @@ $.extend(data, { networkdomain: args.data.networkdomain }); - } + } - if(args.data.cidr !="" ){ - $.extend(data, { - guestvmcidr: args.data.cidr - }); - } + if(args.data.cidr !="" ){ + $.extend(data, { + guestvmcidr: args.data.cidr + }); + } //args.data.networkofferingid is null when networkofferingid field is hidden if(args.data.networkofferingid != null && args.data.networkofferingid != args.context.networks[0].networkofferingid) { @@ -1606,7 +1606,10 @@ success: function(json) { args.response.success({ _custom: { - jobId: json.addiptonicresponse.jobid + getUpdatedItem: function(data) { + + }, + jobId: json.addiptovmnicresponse.jobid } }); } @@ -1676,11 +1679,18 @@ url: createURL('listNics'), data: { nicId: args.context.nics[0].id, - vmId: args.context.instances[0].id + virtualmachineid: args.context.instances[0].id }, success: function(json) { + var ips = json.listnics.nic[0].secondaryip + args.response.success({ - data: json.listnicsresponse.nic[0].ipAddresses + data: $(ips).map(function(index, ip) { + return $.extend(ip, { + zonename: args.context.instances[0].zonename, + virtualmachinedisplayname: args.context.instances[0].displayname + }); + }) }); } });
