apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-04 00:02:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/4.12'

Browse Source
This commit is contained in:
Rohit Yadav 2019-05-30 12:31:26 +05:30
commit 0f4b1f511f
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ui/scripts/network.js
View File

@ -91,7 +91,7 @@
url: createURL('listNics'),
data: {
virtualmachineid: instance.id,
networkId: network.id
networkid: (args.context.networkid != undefined) ? args.context.networkid : network.id
},
success: function(json) {
var nic = json.listnicsresponse.nic[0];
@ -2465,6 +2465,10 @@
networkid: $tierSelect.val(),
vpcid: args.context.vpc[0].id
});
$.extend(args.context, {
networkid: $tierSelect.val(),
vpcid: args.context.vpc[0].id
});
} else if ('networks' in args.context && !args.context.ipAddresses[0].isportable) {
$.extend(data, {
networkid: args.context.networks[0].id

2
ui/scripts/vpc.js
View File

@ -90,7 +90,7 @@
url: createURL('listNics'),
data: {
virtualmachineid: instance.id,
nicId: instance.nic[0].id
networkId: network.id
},
success: function(json) {
var nic = json.listnicsresponse.nic[0];