CLOUDSTACK-6026: UI > create network offering > pass serviceofferingid parameter instead of systemOfferingForRouter parameter to API. (cherry picked from commit e7ec79b5f34f9f5cbe06653ec1948c7064c5b784)
Signed-off-by: Animesh Chaturvedi <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f0b28794 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f0b28794 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f0b28794 Branch: refs/heads/4.3 Commit: f0b28794dd0b634632d7877a0f44c21fe92aab77 Parents: 85091e9 Author: Jessica Wang <[email protected]> Authored: Tue Feb 4 16:16:31 2014 -0800 Committer: Animesh Chaturvedi <[email protected]> Committed: Fri Feb 7 13:16:09 2014 -0800 ---------------------------------------------------------------------- ui/scripts/configuration.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f0b28794/ui/scripts/configuration.js ---------------------------------------------------------------------- diff --git a/ui/scripts/configuration.js b/ui/scripts/configuration.js index 42ae5ee..420cb7b 100644 --- a/ui/scripts/configuration.js +++ b/ui/scripts/configuration.js @@ -1716,7 +1716,7 @@ preFilter: function(args) { var $availability = args.$form.find('.form-item[rel=availability]'); var $lbType = args.$form.find('.form-item[rel=lbType]'); - var $systemOfferingForRouter = args.$form.find('.form-item[rel=systemOfferingForRouter]'); + var $serviceofferingid = args.$form.find('.form-item[rel=serviceofferingid]'); var $conservemode = args.$form.find('.form-item[rel=conservemode]'); var $serviceSourceNatRedundantRouterCapabilityCheckbox = args.$form.find('.form-item[rel="service.SourceNat.redundantRouterCapabilityCheckbox"]'); var hasAdvancedZones = false; @@ -1858,9 +1858,9 @@ } }); if (havingVirtualRouterForAtLeastOneService == true) { - $systemOfferingForRouter.css('display', 'inline-block'); + $serviceofferingid.css('display', 'inline-block'); } else { - $systemOfferingForRouter.hide(); + $serviceofferingid.hide(); } @@ -2281,7 +2281,7 @@ }, //show or hide upon checked services and selected providers above (begin) - systemOfferingForRouter: { + serviceofferingid: { label: 'System Offering for Router', isHidden: true, docID: 'helpNetworkOfferingSystemOffering', @@ -2574,8 +2574,8 @@ delete inputData.egresspolicy; } - if (args.$form.find('.form-item[rel=systemOfferingForRouter]').css("display") == "none") - delete inputData.systemOfferingForRouter; + if (args.$form.find('.form-item[rel=serviceofferingid]').css("display") == "none") + delete inputData.serviceofferingid; inputData['traffictype'] = 'GUEST'; //traffic type dropdown has been removed since it has only one option ('Guest'). Hardcode traffic type value here.
