You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by mu...@apache.org on 2012/12/06 09:09:10 UTC
[42/100] [abbrv] git commit: CS-16748:Add Network Resource Dialog
Shows Inline Mode Configuration Option for Virtual Router as the Firewall
Provider
CS-16748:Add Network Resource Dialog Shows Inline Mode Configuration Option for Virtual Router as the Firewall Provider
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/9547a2f8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/9547a2f8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/9547a2f8
Branch: refs/heads/events-framework
Commit: 9547a2f86edfccca3d76fb278f9c3939264a4db4
Parents: 3e89818
Author: Pranav Saxena <pr...@citrix.com>
Authored: Thu Nov 8 17:13:39 2012 +0530
Committer: Pranav Saxena <pr...@citrix.com>
Committed: Thu Nov 8 17:13:39 2012 +0530
----------------------------------------------------------------------
ui/scripts/configuration.js | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/9547a2f8/ui/scripts/configuration.js
----------------------------------------------------------------------
diff --git a/ui/scripts/configuration.js b/ui/scripts/configuration.js
index 435a68d..83901ee 100644
--- a/ui/scripts/configuration.js
+++ b/ui/scripts/configuration.js
@@ -1268,7 +1268,7 @@
//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.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 {