mirror of
https://github.com/apache/cloudstack.git
synced 2025-12-20 12:33:53 +01:00
Fix for instance wizard, step 5
-Don't pass account and domainid if projects are active
This commit is contained in:
parent
229b08fd48
commit
7f672097f9
@ -216,8 +216,18 @@
|
|||||||
//step5ContainerType = 'nothing-to-select'; //for testing only, comment it out before checking in!!!!!!!!!!!!
|
//step5ContainerType = 'nothing-to-select'; //for testing only, comment it out before checking in!!!!!!!!!!!!
|
||||||
if(step5ContainerType == 'select-network') {
|
if(step5ContainerType == 'select-network') {
|
||||||
var defaultNetworkArray = [], optionalNetworkArray = [];
|
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({
|
$.ajax({
|
||||||
url: createURL("listNetworks&domainid="+g_domainid+"&account="+g_account+"&zoneId="+args.currentData.zoneid),
|
url: createURL('listNetworks'),
|
||||||
|
data: networkData,
|
||||||
dataType: "json",
|
dataType: "json",
|
||||||
async: false,
|
async: false,
|
||||||
success: function(json) {
|
success: function(json) {
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user