etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
Jessica Wang 2014-02-04 16:16:31 -08:00
parent d7ec9ca815
commit e7ec79b5f3
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

@ -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.