cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sate...@apache.org
Subject [19/50] [abbrv] git commit: updated refs/heads/vmware-datamodel to 8996ea3
Date Wed, 22 May 2013 13:57:02 GMT
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/cf6045f1
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/cf6045f1
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/cf6045f1

Branch: refs/heads/vmware-datamodel
Commit: cf6045f1aa37674f0225144ae0a1f662f955f153
Parents: 0365d55
Author: Jessica Wang <jessicawang@apache.org>
Authored: Mon May 20 13:40:37 2013 -0700
Committer: Jessica Wang <jessicawang@apache.org>
Committed: Mon May 20 13:41:02 2013 -0700

----------------------------------------------------------------------
 ui/scripts/configuration.js |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cf6045f1/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.
 								


Mime
View raw message