From 6db07e49c6a228a4bf33b0e4fd35e69de19936ce Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Tue, 28 Sep 2010 15:11:12 -0700
Subject: [PATCH] fix a bug - zones page - Direct VLAN IP Range - account field
 appears twice in view mode.

---
 ui/scripts/cloud.core.configuration.js | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/ui/scripts/cloud.core.configuration.js b/ui/scripts/cloud.core.configuration.js
index 3f9731e45e5..84a58ca625b 100644
--- a/ui/scripts/cloud.core.configuration.js
+++ b/ui/scripts/cloud.core.configuration.js
@@ -781,26 +781,22 @@ function showConfigurationTab() {
 				var isTagged = target.data("vlan") != "untagged";
 				if (isDirect) {
 					title = "<strong>Direct VLAN IP Range</strong>";
-				}
-				var rightPanelHtmlForDirect = "";
-				if (isDirect && isTagged) {
-					rightPanelHtmlForDirect = "<p><span>Domain ID:</span> "+target.data("domainId")+"</p><p><span>Account:</span> "+target.data("account")+"</p>"
-				} else if (isDirect && !isTagged) {
-					rightPanelHtmlForDirect = "<p><span>Pod:</span> "+target.data("podname")+"</p>";
-				}
-				
+				}				
 				rightPanel.html(title);
 				
 				var rightContentHtml = 
-					"<p><span>VLAN ID:</span> "+target.data("vlan")+"</p>"
-					+ rightPanelHtmlForDirect
+					"<p><span>VLAN ID:</span> "+target.data("vlan")+"</p>"				
 					+ "<p><span>Gateway:</span> "+target.data("gateway")+"</p>"
 					+ "<p><span>Netmask:</span> "+target.data("netmask")+"</p>"
 					+ "<p><span>IP Range:</span> "+target.data("name")+"</p>";
-				if(target.data("domain")!=null) 
-					rightContentHtml += "<p><span>Domain:</span> "+target.data("domain")+"</p>";	
-		        if(target.data("account")!=null) 
-					rightContentHtml += "<p><span>Account:</span> "+target.data("account")+"</p>";						
+				if(target.data("domainId")!=null) 
+					rightContentHtml += "<p><span>Domain ID:</span> "+target.data("domainId")+"</p>";	
+				if(target.data("domain")!=null) 
+					rightContentHtml += "<p><span>Domain:</span> "+target.data("domain")+"</p>";	
+		        if(target.data("account")!=null) 
+					rightContentHtml += "<p><span>Account:</span> "+target.data("account")+"</p>";	
+			    if(target.data("podname")!=null) 
+					rightContentHtml += "<p><span>Pod:</span> "+target.data("podname")+"</p>";						
 				rightContent.data("id", target.data("id")).html(rightContentHtml);
 				
 				$("#submenu_content_zones").find("#action_edit_zone, #action_add_pod, #action_edit_pod, #action_add_publicip_vlan, #action_add_directip_vlan").hide();