etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Explicit Dedication : Zone

This commit is contained in:
Pranav Saxena 2013-05-30 18:08:04 +05:30
parent 22ff6bb2ea
commit b4e2962138
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
ui/scripts/zoneWizard.js
View File

@ -348,11 +348,18 @@
}
setTimeout(function() {
/* setTimeout(function() {
if ($form.find('input[name=ispublic]').is(':checked')) {
$form.find('[rel=domain]').hide();
$form.find('[rel=domain]').show();
$form.find('[rel=accountId]').show();
}
});
else{
$form.find('[rel=domain]').hide();
$form.find('[rel=accountId]').hide();
}
});*/
},
fields: {
name: {
@ -542,7 +549,7 @@
validation: { required: false }
},
ispublic: {
isReverse: true,
//isReverse: true,
isBoolean: true,
label: 'Dedicate',
isChecked: false //checked by default (public zone)
@ -674,7 +681,7 @@
gslbprovider: {
label: 'GSLB service',
isBoolean: true,
isChecked: true
isChecked: false
},
gslbproviderpublicip: {
label: 'GSLB service Public IP'
@ -1598,8 +1605,10 @@
array1.push("&internaldns2=" + todb(internaldns2));
if(args.data.pluginFrom == null) { //from zone wizard, not from quick instsaller(args.data.pluginFrom != null && args.data.pluginFrom.name == 'installWizard') who doesn't have public checkbox
// if(args.data.zone.ispublic != null) //public checkbox in zone wizard is unchecked
// if(args.data.zone.ispublic != null){ //public checkbox in zone wizard is unchecked
// array1.push("&domainid=" + args.data.zone.domain);
// }
}
if(args.data.zone.networkdomain != null && args.data.zone.networkdomain.length > 0)
@ -1623,13 +1632,13 @@
if(args.data.pluginFrom == null && args.data.zone.ispublic != null){
var array2 = [];
if(args.data.zone.domain != null)
array2.push("&domainid=" + args.data.zone.domain);
array2.push("&domainid=" + args.data.zone.domain);
if(args.data.zone.accountId != "")
array2.push("&accountId=" +todb(args.data.zone.accountId));
if(dedicatedZoneId != null){
$.ajax({
url:createURL("dedicateZone&ZoneId=" +dedicatedZoneId +"&domain=" +args.data.zone.domain + array2.join("")),
url:createURL("dedicateZone&ZoneId=" +dedicatedZoneId + array2.join("")),
dataType:"json",
success:function(json){
var dedicatedObj = json.dedicatezoneresponse.jobid;