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

CLOUDSTACK-4111: UI > IP Addresses page > Associate New IP dialog - show/hide cross zone dropdown upon new property "portableipserviceenabled" in listRegions API response.

This commit is contained in:
Jessica Wang 2013-08-12 15:05:41 -07:00
parent d1b4a8d98c
commit 5acbaebbf2
1 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
ui/scripts/network.js
View File

@ -1994,21 +1994,30 @@
return true; //VPC section, show Acquire IP button
}
},
messages: {
/*
confirm: function(args) {
if(args.context.vpc)
return 'message.acquire.new.ip.vpc';
else
return 'message.acquire.new.ip';
},
*/
messages: {
notification: function(args) {
return 'label.acquire.new.ip';
}
},
createForm: {
title: 'label.acquire.new.ip',
desc: 'Please confirm that you want to acquire new IP',
preFilter: function(args) {
$.ajax({
url: createURL('listRegions'),
success: function(json) {
var items = json.listregionsresponse.region;
if(items != null) {
var region = items[0];
if(region.portableipserviceenabled == true) {
args.$form.find('.form-item[rel=isportable]').css('display', 'inline-block');
} else {
args.$form.find('.form-item[rel=isportable]').hide();
}
}
}
});
},
fields: {
isportable: {
label: 'label.cross.zones',
@ -2025,14 +2034,19 @@
args.response.success({
data: items
});
}
},
isHidden: true
}
}
},
action: function(args) {
var dataObj = {
isportable: args.data.isportable
};
var dataObj = {};
if (args.$form.find('.form-item[rel=isportable]').css("display") != "none") {
$.extend(dataObj, {
isportable: args.data.isportable
});
}
if ('vpc' in args.context) { //from VPC section
$.extend(dataObj, {
vpcid: args.context.vpc[0].id