You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by pr...@apache.org on 2013/05/28 09:58:47 UTC
[02/50] git commit: updated refs/heads/master to b03e419
CLOUDSTACK-747: internalLb in VPC - UI - create network offering - system offering dropdown is for router only. Change its variable name to be more intuitive.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9e24af77
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9e24af77
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9e24af77
Branch: refs/heads/master
Commit: 9e24af77b9537d2e2126f2dde3e0b6a6cb871d60
Parents: 034c21b
Author: Jessica Wang <je...@apache.org>
Authored: Mon May 20 13:34:37 2013 -0700
Committer: Jessica Wang <je...@apache.org>
Committed: Mon May 20 13:37:52 2013 -0700
----------------------------------------------------------------------
ui/scripts/configuration.js | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9e24af77/ui/scripts/configuration.js
----------------------------------------------------------------------
diff --git a/ui/scripts/configuration.js b/ui/scripts/configuration.js
index 9a08c4c..e3421a3 100644
--- a/ui/scripts/configuration.js
+++ b/ui/scripts/configuration.js
@@ -1122,7 +1122,7 @@
title: 'label.add.network.offering',
preFilter: function(args) {
var $availability = args.$form.find('.form-item[rel=availability]');
- var $serviceOfferingId = args.$form.find('.form-item[rel=serviceOfferingId]');
+ var $systemOfferingForRouter = args.$form.find('.form-item[rel=systemOfferingForRouter]');
var $conservemode = args.$form.find('.form-item[rel=conservemode]');
var $serviceSourceNatRedundantRouterCapabilityCheckbox = args.$form.find('.form-item[rel="service.SourceNat.redundantRouterCapabilityCheckbox"]');
var hasAdvancedZones = false;
@@ -1185,10 +1185,10 @@
}
});
if(havingVirtualRouterForAtLeastOneService == true) {
- $serviceOfferingId.css('display', 'inline-block');
+ $systemOfferingForRouter.css('display', 'inline-block');
}
else {
- $serviceOfferingId.hide();
+ $systemOfferingForRouter.hide();
}
@@ -1569,8 +1569,8 @@
},
//show or hide upon checked services and selected providers above (begin)
- serviceOfferingId: {
- label: 'label.system.offering',
+ systemOfferingForRouter: {
+ label: 'System Offering for Router',
docID: 'helpNetworkOfferingSystemOffering',
select: function(args) {
$.ajax({
@@ -1829,8 +1829,8 @@
if(args.$form.find('.form-item[rel=availability]').css("display") == "none")
inputData['availability'] = 'Optional';
- if(args.$form.find('.form-item[rel=serviceOfferingId]').css("display") == "none")
- delete inputData.serviceOfferingId;
+ if(args.$form.find('.form-item[rel=systemOfferingForRouter]').css("display") == "none")
+ delete inputData.systemOfferingForRouter;
inputData['traffictype'] = 'GUEST'; //traffic type dropdown has been removed since it has only one option ('Guest'). Hardcode traffic type value here.