From ec9bbd49939ea46e644364e3bf283c11195285e2 Mon Sep 17 00:00:00 2001
From: Brian Federle <brian@cloud.com>
Date: Thu, 15 Dec 2011 12:35:37 -0800
Subject: [PATCH] bug 12579

Only use openfirewall=false when firewall.rule.ui.enabled is true
---
 ui/scripts/network.js | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/ui/scripts/network.js b/ui/scripts/network.js
index ec4518034b6..6ada127fab6 100644
--- a/ui/scripts/network.js
+++ b/ui/scripts/network.js
@@ -1060,10 +1060,13 @@
                     add: {
                       label: 'Add VMs',
                       action: function(args) {
+                        var openFirewall = g_firewallRuleUiEnabled == "true" ? false : true;
+
                         $.ajax({
                           url: createURL('createLoadBalancerRule'),
+
                           data: $.extend(args.data, {
-                            openfirewall: false,
+                            openfirewall: openFirewall,
                             publicipid: args.context.ipAddresses[0].id
                           }),
                           dataType: 'json',
@@ -1244,10 +1247,13 @@
                     add: {
                       label: 'Add VM',
                       action: function(args) {
+                        var openFirewall = g_firewallRuleUiEnabled == "true" ? false : true;
+
                         $.ajax({
                           url: createURL('createPortForwardingRule'),
+
                           data: $.extend(args.data, {
-                            openfirewall: false,
+                            openfirewall: openFirewall,
                             ipaddressid: args.context.ipAddresses[0].id,
                             virtualmachineid: args.itemData[0].id
                           }),