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

CLOUDSTACK-6026: UI > create network offering > pass serviceofferingid parameter instead of systemOfferingForRouter parameter to API.

Browse Source
This commit is contained in:
Jessica Wang 2014-02-04 16:16:31 -08:00
parent 7cb4b571c8
commit 039b1c1594
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ui/scripts/configuration.js
View File

@ -1742,7 +1742,7 @@
preFilter: function(args) { preFilter: function(args) {
var $availability = args.$form.find('.form-item[rel=availability]'); var $availability = args.$form.find('.form-item[rel=availability]');
var $lbType = args.$form.find('.form-item[rel=lbType]'); 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 $conservemode = args.$form.find('.form-item[rel=conservemode]');
var $serviceSourceNatRedundantRouterCapabilityCheckbox = args.$form.find('.form-item[rel="service.SourceNat.redundantRouterCapabilityCheckbox"]'); var $serviceSourceNatRedundantRouterCapabilityCheckbox = args.$form.find('.form-item[rel="service.SourceNat.redundantRouterCapabilityCheckbox"]');
var hasAdvancedZones = false; var hasAdvancedZones = false;
@ -1884,9 +1884,9 @@
} }
}); });
if (havingVirtualRouterForAtLeastOneService == true) { if (havingVirtualRouterForAtLeastOneService == true) {
$systemOfferingForRouter.css('display', 'inline-block'); $serviceofferingid.css('display', 'inline-block');
} else { } else {
$systemOfferingForRouter.hide(); $serviceofferingid.hide();
} }
@ -2307,7 +2307,7 @@
}, },
//show or hide upon checked services and selected providers above (begin) //show or hide upon checked services and selected providers above (begin)
systemOfferingForRouter: { serviceofferingid: {
label: 'System Offering for Router', label: 'System Offering for Router',
isHidden: true, isHidden: true,
docID: 'helpNetworkOfferingSystemOffering', docID: 'helpNetworkOfferingSystemOffering',
@ -2600,8 +2600,8 @@
delete inputData.egresspolicy; delete inputData.egresspolicy;
} }
if (args.$form.find('.form-item[rel=systemOfferingForRouter]').css("display") == "none") if (args.$form.find('.form-item[rel=serviceofferingid]').css("display") == "none")
delete inputData.systemOfferingForRouter; delete inputData.serviceofferingid;
inputData['traffictype'] = 'GUEST'; //traffic type dropdown has been removed since it has only one option ('Guest'). Hardcode traffic type value here. inputData['traffictype'] = 'GUEST'; //traffic type dropdown has been removed since it has only one option ('Guest'). Hardcode traffic type value here.