Updated Branches: refs/heads/master 1fd771f87 -> aa9dd422d
CS-15985: cloudstack 3.0 UI - IP Address page - should use associatednetworkid instead of networkid when trying to grep an IP Address' parent network. Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/aa9dd422 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/aa9dd422 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/aa9dd422 Branch: refs/heads/master Commit: aa9dd422d934018d3deecd2dd18e20a9d0f70a47 Parents: e986d03 Author: Jessica Wang <[email protected]> Authored: Tue Aug 14 11:35:11 2012 -0700 Committer: Brian Federle <[email protected]> Committed: Tue Aug 14 12:35:41 2012 -0700 ---------------------------------------------------------------------- ui/scripts/network.js | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/aa9dd422/ui/scripts/network.js ---------------------------------------------------------------------- diff --git a/ui/scripts/network.js b/ui/scripts/network.js index 20fee4f..9d8b97a 100644 --- a/ui/scripts/network.js +++ b/ui/scripts/network.js @@ -1697,7 +1697,7 @@ args.context.vpc ? args.context.vpc[0].network : args.context.networks, function(network) { - return network.id = ipObj.networkid; + return network.id = ipObj.associatednetworkid; })[0]; args.response.success({
