mirror of
https://github.com/apache/cloudstack.git
synced 2025-11-02 20:02:29 +01:00
bug 12614: cloudStack 3.0 new UI - system - Add Zone Wizard - basic zone - when securityGroupsEnabled checkbox is checked, only display security-group-enabled network offerings.
This commit is contained in:
parent
16cd1f8f28
commit
171da7e3aa
@ -2906,6 +2906,7 @@
|
||||
}
|
||||
});
|
||||
|
||||
var networkOfferingObjsWithSG = [];
|
||||
var networkOfferingObjsWithoutSG = [];
|
||||
$.ajax({
|
||||
url: createURL("listNetworkOfferings&state=Enabled&guestiptype=Shared"),
|
||||
@ -2923,8 +2924,10 @@
|
||||
break;
|
||||
}
|
||||
}
|
||||
if(includingSGP == false) //withoutSG
|
||||
networkOfferingObjsWithoutSG.push(this);
|
||||
if(includingSGP == false) //without SG
|
||||
networkOfferingObjsWithoutSG.push(this);
|
||||
else //with SG
|
||||
networkOfferingObjsWithSG.push(this);
|
||||
});
|
||||
}
|
||||
});
|
||||
@ -2936,7 +2939,7 @@
|
||||
networkOfferings: networkOfferingObjsWithoutSG,
|
||||
|
||||
// Security group-enabled offerings
|
||||
securityGroupNetworkOfferings: networkOfferingObjs
|
||||
securityGroupNetworkOfferings: networkOfferingObjsWithSG
|
||||
});
|
||||
},
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user