Skip to content

Commit bff7c01

Browse files
committed
CLOUDSTACK-10299: UI: fix error in network listing in project mode
1 parent 264036b commit bff7c01

1 file changed

Lines changed: 12 additions & 14 deletions

File tree

ui/scripts/network.js

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -412,8 +412,6 @@
412412
$.ajax({
413413
url: createURL('listRemoteAccessVpns'),
414414
data: {
415-
account: g_account,
416-
domainid: g_domainid,
417415
listAll: true
418416
},
419417
async: false,
@@ -3524,7 +3522,7 @@
35243522

35253523
var stickyData = $.extend(true, {}, args.data.sticky);
35263524
var certificateData = $.extend(true, {}, args.data.sslcertificate);
3527-
3525+
35283526
//***** create new LB rule > Add VMs *****
35293527
$.ajax({
35303528
url: createURL('createLoadBalancerRule'),
@@ -3537,28 +3535,28 @@
35373535
var lbID = data.createloadbalancerruleresponse.id;
35383536

35393537
var inputData = {
3540-
id: data.createloadbalancerruleresponse.id
3541-
};
3542-
3538+
id: data.createloadbalancerruleresponse.id
3539+
};
3540+
35433541
var selectedVMs = args.itemData;
35443542
if (selectedVMs != null) {
35453543
var vmidipmapIndex = 0;
3546-
for (var vmIndex = 0; vmIndex < selectedVMs.length; vmIndex++) {
3544+
for (var vmIndex = 0; vmIndex < selectedVMs.length; vmIndex++) {
35473545
var selectedIPs = selectedVMs[vmIndex]._subselect;
35483546
for (var ipIndex = 0; ipIndex < selectedIPs.length; ipIndex++) {
35493547
inputData['vmidipmap[' + vmidipmapIndex + '].vmid'] = selectedVMs[vmIndex].id;
3550-
3548+
35513549
if (args.context.ipAddresses[0].isportable) {
3552-
inputData['vmidipmap[' + vmidipmapIndex + '].vmip'] = selectedIPs[ipIndex].split(',')[1];
3550+
inputData['vmidipmap[' + vmidipmapIndex + '].vmip'] = selectedIPs[ipIndex].split(',')[1];
35533551
} else {
35543552
inputData['vmidipmap[' + vmidipmapIndex + '].vmip'] = selectedIPs[ipIndex];
35553553
}
3556-
3554+
35573555
vmidipmapIndex++;
3558-
}
3556+
}
35593557
}
3560-
}
3561-
3558+
}
3559+
35623560
/*$.ajax({
35633561
url: createURL('assignCertToLoadBalancer'),
35643562
data: {certid: certificateData.certificate, lbruleid: lbID},
@@ -3568,7 +3566,7 @@
35683566
35693567
args.response.success({
35703568
_custom: {
3571-
jobId: jobID
3569+
jobId: jobID
35723570
},
35733571
notification: {
35743572
label: 'label.add.certificate',

0 commit comments

Comments
 (0)