You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by je...@apache.org on 2013/01/19 00:12:48 UTC
git commit: CLOUDSTACK-459: cloudstack UI - create network offering
dialog - update comment in code.
Updated Branches:
refs/heads/master 189c20b66 -> d13d67bdd
CLOUDSTACK-459: cloudstack UI - create network offering dialog - update comment in code.
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/d13d67bd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/d13d67bd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/d13d67bd
Branch: refs/heads/master
Commit: d13d67bdd9b6424d5fde8861a383c45c06314e2c
Parents: 189c20b
Author: Jessica Wang <je...@citrix.com>
Authored: Fri Jan 18 15:03:07 2013 -0800
Committer: Jessica Wang <je...@citrix.com>
Committed: Fri Jan 18 15:11:46 2013 -0800
----------------------------------------------------------------------
ui/scripts/configuration.js | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/d13d67bd/ui/scripts/configuration.js
----------------------------------------------------------------------
diff --git a/ui/scripts/configuration.js b/ui/scripts/configuration.js
index dc5f8f0..30c850f 100644
--- a/ui/scripts/configuration.js
+++ b/ui/scripts/configuration.js
@@ -1293,11 +1293,11 @@
}
}
//hide/show service fields ***** (end) *****
-
-
- //show LB InlineMode dropdown only when (1)LB Service is checked (2)Service Provider is F5
- if((args.$form.find('.form-item[rel=\"service.Lb.isEnabled\"]').find('input[type=checkbox]').is(':checked') == true)
- &&(args.$form.find('.form-item[rel=\"service.Lb.provider\"]').find('select').val() == 'F5BigIp') && ( args.$form.find('.form-item[rel=\"service.Firewall.isEnabled\"]').find('input[type=checkbox]').is(':checked') == true) && (args.$form.find('.form-item[rel=\"service.Firewall.provider\"]').find('select').val() == 'JuniperSRX')) {
+
+ //show LB InlineMode dropdown only when (1)LB service is checked and LB service provider is F5BigIp (2)Firewall service is checked and Firewall service provider is JuniperSRX
+ if((args.$form.find('.form-item[rel=\"service.Lb.isEnabled\"]').find('input[type=checkbox]').is(':checked') == true) && (args.$form.find('.form-item[rel=\"service.Lb.provider\"]').find('select').val() == 'F5BigIp') &&
+ (args.$form.find('.form-item[rel=\"service.Firewall.isEnabled\"]').find('input[type=checkbox]').is(':checked') == true) && (args.$form.find('.form-item[rel=\"service.Firewall.provider\"]').find('select').val() == 'JuniperSRX'))
+ {
args.$form.find('.form-item[rel=\"service.Lb.inlineModeDropdown\"]').css('display', 'inline-block');
}
else {