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

CLOUDSTACK-2678: portable IP ranges - Associate IP Address - pop up a dialog that have cross zone dropdown (yes/no) and send selected option to API call.

This commit is contained in:
Jessica Wang 2013-05-28 15:57:14 -07:00
parent f2c468d00c
commit 560fa52fdc
1 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
ui/scripts/network.js
View File

@ -1755,18 +1755,36 @@
}
},
messages: {
/*
confirm: function(args) {
if(args.context.vpc)
return 'message.acquire.new.ip.vpc';
else
return 'message.acquire.new.ip';
},
*/
notification: function(args) {
return 'label.acquire.new.ip';
}
},
},
createForm: {
title: 'label.acquire.new.ip',
fields: {
isportable: {
label: 'label.cross.zones',
select: function(args) {
var items = [];
items.push({ id: "false", description: _l('label.no') });
items.push({ id: "true", description: _l('label.yes') });
args.response.success({data: items});
}
}
}
},
action: function(args) {
var dataObj = {};
var dataObj = {
isportable: args.data.isportable
};
if('vpc' in args.context) { //from VPC section
$.extend(dataObj, {
vpcid: args.context.vpc[0].id
@ -2299,6 +2317,12 @@
ipaddress: { label: 'label.ip' }
},
{
isportable: {
label: 'label.cross.zones',
converter: function(data) {
return data ? _l('label.yes') : _l('label.no');
}
},
id: { label: 'label.id' },
associatednetworkid: { label: 'label.associated.network.id' },
networkname: { label: 'label.associated.network' },