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

CLOUDSTACK-6148: UI > IP Address > load balancing > add VM dialog > show NIC Secondary IP Address when VM is selected.

This commit is contained in:
Jessica Wang 2014-02-20 12:01:38 -08:00
parent 19b15a1bdc
commit e9460d23d5
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ui/scripts/network.js
View File

@ -3232,6 +3232,10 @@
}
},
filters: false,
subselect: {
label: 'label.use.vm.ip',
dataProvider: instanceSecondaryIPSubselect
},
dataProvider: function(args) {
var itemData = $.isArray(args.context.multiRule) && args.context.multiRule[0]['_itemData'] ?
args.context.multiRule[0]['_itemData'] : [];
@ -3485,7 +3489,21 @@
};
var stickyData = $.extend(true, {}, args.data.sticky);
if (args.context.ipAddresses[0].isportable) {
var subselect = args.itemData[0]._subselect.split(',');
//var networkid = subselect[0];
var vmguestip = subselect[1];
//data.networkid = networkid;
if (parseInt(vmguestip) !== -1) {
data.vmguestip = vmguestip;
}
} else if (args.itemData[0]._subselect && args.itemData[0]._subselect != -1) {
data.vmguestip = args.itemData[0]._subselect;
}
$.ajax({
url: createURL('createLoadBalancerRule'),
data: data,