cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jessicaw...@apache.org
Subject git commit: updated refs/heads/4.3-forward to e7ec79b
Date Wed, 05 Feb 2014 00:17:21 GMT
Updated Branches:
  refs/heads/4.3-forward d7ec9ca81 -> e7ec79b5f


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


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e7ec79b5
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e7ec79b5
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e7ec79b5

Branch: refs/heads/4.3-forward
Commit: e7ec79b5f34f9f5cbe06653ec1948c7064c5b784
Parents: d7ec9ca
Author: Jessica Wang <jessicawang@apache.org>
Authored: Tue Feb 4 16:16:31 2014 -0800
Committer: Jessica Wang <jessicawang@apache.org>
Committed: Tue Feb 4 16:16:31 2014 -0800

----------------------------------------------------------------------
 ui/scripts/configuration.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


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


Mime
View raw message