From bff7c01f19264e85c0da4a79c45f619761cfcc86 Mon Sep 17 00:00:00 2001 From: Rene Moser Date: Tue, 20 Feb 2018 16:46:24 +0100 Subject: [PATCH 1/2] CLOUDSTACK-10299: UI: fix error in network listing in project mode --- ui/scripts/network.js | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/ui/scripts/network.js b/ui/scripts/network.js index 7b9f75e7fda..30c02220813 100644 --- a/ui/scripts/network.js +++ b/ui/scripts/network.js @@ -412,8 +412,6 @@ $.ajax({ url: createURL('listRemoteAccessVpns'), data: { - account: g_account, - domainid: g_domainid, listAll: true }, async: false, @@ -3524,7 +3522,7 @@ var stickyData = $.extend(true, {}, args.data.sticky); var certificateData = $.extend(true, {}, args.data.sslcertificate); - + //***** create new LB rule > Add VMs ***** $.ajax({ url: createURL('createLoadBalancerRule'), @@ -3537,28 +3535,28 @@ var lbID = data.createloadbalancerruleresponse.id; var inputData = { - id: data.createloadbalancerruleresponse.id - }; - + id: data.createloadbalancerruleresponse.id + }; + var selectedVMs = args.itemData; if (selectedVMs != null) { var vmidipmapIndex = 0; - for (var vmIndex = 0; vmIndex < selectedVMs.length; vmIndex++) { + for (var vmIndex = 0; vmIndex < selectedVMs.length; vmIndex++) { var selectedIPs = selectedVMs[vmIndex]._subselect; for (var ipIndex = 0; ipIndex < selectedIPs.length; ipIndex++) { inputData['vmidipmap[' + vmidipmapIndex + '].vmid'] = selectedVMs[vmIndex].id; - + if (args.context.ipAddresses[0].isportable) { - inputData['vmidipmap[' + vmidipmapIndex + '].vmip'] = selectedIPs[ipIndex].split(',')[1]; + inputData['vmidipmap[' + vmidipmapIndex + '].vmip'] = selectedIPs[ipIndex].split(',')[1]; } else { inputData['vmidipmap[' + vmidipmapIndex + '].vmip'] = selectedIPs[ipIndex]; } - + vmidipmapIndex++; - } + } } - } - + } + /*$.ajax({ url: createURL('assignCertToLoadBalancer'), data: {certid: certificateData.certificate, lbruleid: lbID}, @@ -3568,7 +3566,7 @@ args.response.success({ _custom: { - jobId: jobID + jobId: jobID }, notification: { label: 'label.add.certificate', From 2a5459d517b7b0b3cd85024b531fbd4b2e780f36 Mon Sep 17 00:00:00 2001 From: Rene Moser Date: Mon, 26 Feb 2018 11:57:44 +0100 Subject: [PATCH 2/2] cleanup commented out code --- ui/scripts/network.js | 62 ------------------------------------------- 1 file changed, 62 deletions(-) diff --git a/ui/scripts/network.js b/ui/scripts/network.js index 30c02220813..bcb748d49de 100644 --- a/ui/scripts/network.js +++ b/ui/scripts/network.js @@ -86,12 +86,6 @@ }); } else { //non-portable IP which has only one NIC - /* - var nic = $.grep(instance.nic, function(nic) { - return nic.networkid == network.id; - })[0]; - */ - // Get NIC IPs $.ajax({ url: createURL('listNics'), @@ -170,12 +164,6 @@ }); } else { //non-portable IP which has only one NIC - /* - var nic = $.grep(instance.nic, function(nic) { - return nic.networkid == network.id; - })[0]; - */ - // Get NIC IPs $.ajax({ url: createURL('listNics'), @@ -1993,8 +1981,6 @@ $.ajax({ url: createURL('listZones'), data: dataObj, - // id: args.context.networks[0].zoneid - // }, async: false, success: function(json) { zoneObj = json.listzonesresponse.zone[0]; @@ -3557,49 +3543,6 @@ } } - /*$.ajax({ - url: createURL('assignCertToLoadBalancer'), - data: {certid: certificateData.certificate, lbruleid: lbID}, - success: function(data) { - var jobID = data.assigncerttoloadbalancerresponse.jobid; - var lbProtocolCreated = false; - - args.response.success({ - _custom: { - jobId: jobID - }, - notification: { - label: 'label.add.certificate', - poll: function(args) { - var complete = args.complete; - var error = args.error; - - pollAsyncJobResult({ - _custom: { - jobId: jobID - }, - complete: function(args) { - if (lbProtocolCreated) return; - - lbProtocolCreated = true; - - if (certificateData && certificateData.certificate) { - cloudStack.lbCertificatePolicy.actions.add(lbID, certificateData, complete, error); - } else { - complete(); - } - }, - error: error - }); - } - } - }); - }, - error: function(data) { - args.response.error(parseXMLHttpResponse(data)); - } - });*/ - $.ajax({ url: createURL('assignToLoadBalancerRule'), data: inputData, @@ -5972,11 +5915,6 @@ docID: 'helpVPNGatewayIKEDH', select: function(args) { var items = []; - // StrongSwan now requires a DH group to be specified... - //items.push({ - // id: '', - // description: _l('label.none') - //}); items.push({ id: 'modp1536', description: 'Group 5(modp1536)'