From e3d7bad1c50631bdfbfbedf3c380aa47cb487f89 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Fri, 14 Jan 2011 15:47:26 -0800
Subject: [PATCH] network page - Add External Firewall dialog - add User
 Interface field.

---
 ui/jsp/network.jsp               |  9 ++++++++-
 ui/scripts/cloud.core.network.js | 15 ++++++++++++++-
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/ui/jsp/network.jsp b/ui/jsp/network.jsp
index ca16b59eb55..7df259a34e3 100644
--- a/ui/jsp/network.jsp
+++ b/ui/jsp/network.jsp
@@ -839,7 +839,14 @@
                 <input class="text" type="text" id="private_interface" />
                 <div id="private_interface_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
                 </div>
-            </li>       
+            </li>             
+            <li>
+                <label>
+                    User Interface:</label>
+                <input class="text" type="text" id="user_interface" />
+                <div id="user_interface_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
+                </div>
+            </li>                  
             <li>
                 <label>
                     Public Zone:</label>
diff --git a/ui/scripts/cloud.core.network.js b/ui/scripts/cloud.core.network.js
index 64f84d20f1c..f508b76a62e 100644
--- a/ui/scripts/cloud.core.network.js
+++ b/ui/scripts/cloud.core.network.js
@@ -599,7 +599,8 @@ function bindAddExternalFirewallButton($button, $midmenuItem1) {
 				isValid &= validateString("User Name", $thisDialog.find("#username"), $thisDialog.find("#username_errormsg"), false); //required
 				isValid &= validateString("Password", $thisDialog.find("#password"), $thisDialog.find("#password_errormsg"), false);  //required				
 				isValid &= validateString("Public Interface", $thisDialog.find("#public_interface"), $thisDialog.find("#public_interface_errormsg"), true);  //optinal
-				isValid &= validateString("Private Interface", $thisDialog.find("#private_interface"), $thisDialog.find("#private_interface_errormsg"), true);  //optinal
+				isValid &= validateString("Private Interface", $thisDialog.find("#private_interface"), $thisDialog.find("#private_interface_errormsg"), true);  //optinal				
+				isValid &= validateString("User Interface", $thisDialog.find("#user_interface"), $thisDialog.find("#user_interface_errormsg"), true);  //optinal				
 				isValid &= validateString("Public Zone", $thisDialog.find("#public_zone"), $thisDialog.find("#public_zone_errormsg"), true);  //optinal
 				isValid &= validateString("Private Zone", $thisDialog.find("#private_zone"), $thisDialog.find("#private_zone_errormsg"), true);  //optinal
 				if (!isValid) 
@@ -651,6 +652,18 @@ function bindAddExternalFirewallButton($button, $midmenuItem1) {
 				    }  		
 				    url.push("privateInterface="+privateInterface); 
 				}
+				 
+				var userInterface = $thisDialog.find("#user_interface").val();
+				if(userInterface != null && userInterface.length > 0) {
+				    if(isQuestionMarkAdded == false) {
+				        url.push("?");
+				        isQuestionMarkAdded = true;
+				    }
+				    else {
+				        url.push("&");
+				    }  				    
+				    url.push("userInterface="+userInterface); 
+				} 
 				    
 				var publicZone = $thisDialog.find("#public_zone").val();
 				if(publicZone != null && publicZone.length > 0) {