From 7f672097f92c244e891fa029379aa5548fab1feb Mon Sep 17 00:00:00 2001 From: Brian Federle Date: Thu, 1 Dec 2011 14:17:58 -0800 Subject: [PATCH] Fix for instance wizard, step 5 -Don't pass account and domainid if projects are active --- ui/scripts/instances.js | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js index bddf1fae0ee..d9c80d18ae9 100644 --- a/ui/scripts/instances.js +++ b/ui/scripts/instances.js @@ -216,8 +216,18 @@ //step5ContainerType = 'nothing-to-select'; //for testing only, comment it out before checking in!!!!!!!!!!!! if(step5ContainerType == 'select-network') { var defaultNetworkArray = [], optionalNetworkArray = []; + var networkData = { + zoneId: args.currentData.zoneid + }; + + if (!(cloudStack.context.projects && cloudStack.context.projects[0])) { + networkData.domainid = g_domainid; + networkData.account = g_account; + } + $.ajax({ - url: createURL("listNetworks&domainid="+g_domainid+"&account="+g_account+"&zoneId="+args.currentData.zoneid), + url: createURL('listNetworks'), + data: networkData, dataType: "json", async: false, success: function(json) {