Updated Branches: refs/heads/master 163779200 -> 8c76baa05
CLOUDSTACK-459: cloudstack UI - create network offering dialog - fix a bug that associatePublicIP parameter was passed to createNetworkOffering API incorrectly. Fix it to pass associatePublicIP parameter as part of servicecapabilitylist. Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/8c76baa0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/8c76baa0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/8c76baa0 Branch: refs/heads/master Commit: 8c76baa0544846149916cfc0c98b81203ee546ca Parents: 1637792 Author: Jessica Wang <[email protected]> Authored: Mon Nov 26 16:58:24 2012 -0800 Committer: Jessica Wang <[email protected]> Committed: Mon Nov 26 16:58:24 2012 -0800 ---------------------------------------------------------------------- ui/scripts/configuration.js | 26 ++++++++++++++------------ 1 files changed, 14 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8c76baa0/ui/scripts/configuration.js ---------------------------------------------------------------------- diff --git a/ui/scripts/configuration.js b/ui/scripts/configuration.js index a8ce108..ca886c7 100644 --- a/ui/scripts/configuration.js +++ b/ui/scripts/configuration.js @@ -1328,13 +1328,13 @@ &&(args.$form.find('.form-item[rel=\"service.StaticNat.provider\"]').find('select').val() == 'Netscaler') &&(args.$form.find('.form-item[rel=\"guestIpType\"]').find('select').val() == 'Shared')) { args.$form.find('.form-item[rel=\"service.StaticNat.elasticIpCheckbox\"]').css('display', 'inline-block'); - args.$form.find('.form-item[rel=\"associatePublicIP\"]').css('display', 'inline-block'); + args.$form.find('.form-item[rel=\"service.StaticNat.associatePublicIP\"]').css('display', 'inline-block'); } else { args.$form.find('.form-item[rel=\"service.StaticNat.elasticIpCheckbox\"]').hide(); args.$form.find('.form-item[rel=\"service.StaticNat.elasticIpCheckbox\"]').find('input[type=checkbox]').attr('checked', false); - args.$form.find('.form-item[rel=\"associatePublicIP\"]').hide(); - args.$form.find('.form-item[rel=\"associatePublicIP\"]').find('input[type=checkbox]').attr('checked',false); + args.$form.find('.form-item[rel=\"service.StaticNat.associatePublicIP\"]').hide(); + args.$form.find('.form-item[rel=\"service.StaticNat.associatePublicIP\"]').find('input[type=checkbox]').attr('checked',false); } }); @@ -1617,8 +1617,9 @@ isHidden: true, isBoolean: true }, - "associatePublicIP": { - label: 'Associate IP', + + "service.StaticNat.associatePublicIP": { + label: 'Associate Public IP', isBoolean: true, isHidden: true }, @@ -1699,7 +1700,13 @@ inputData['servicecapabilitylist[' + serviceCapabilityIndex + '].capabilitytype'] = 'ElasticIp'; inputData['servicecapabilitylist[' + serviceCapabilityIndex + '].capabilityvalue'] = true; //because this checkbox's value == "on" serviceCapabilityIndex++; - } + } + else if ((key == 'service.StaticNat.associatePublicIP') && ("StaticNat" in serviceProviderMap)) { //if checkbox is unchecked, it won't be included in formData in the first place. i.e. it won't fall into this section + inputData['servicecapabilitylist[' + serviceCapabilityIndex + '].service'] = 'StaticNat'; + inputData['servicecapabilitylist[' + serviceCapabilityIndex + '].capabilitytype'] = 'associatePublicIP'; + inputData['servicecapabilitylist[' + serviceCapabilityIndex + '].capabilityvalue'] = true; //because this checkbox's value == "on" + serviceCapabilityIndex++; + } } else if (value != '') { // Normal data inputData[key] = value; @@ -1733,12 +1740,7 @@ } else { inputData['conservemode'] = false; } - - if (inputData['associatePublicIP'] == 'on') { - inputData['associatePublicIP'] = true; - } else { - inputData['associatePublicIP'] = false; - } + // Make service provider map var serviceProviderIndex = 0;
