From 4919e2f4589181a5b541dd67459b88fc3378f6d0 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Mon, 1 Nov 2010 20:36:57 -0700
Subject: [PATCH] new UI - domain page - restore listResourceLimits section
 since bug 6697 is fixed.

---
 ui/new/scripts/cloud.core2.domain.js | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/ui/new/scripts/cloud.core2.domain.js b/ui/new/scripts/cloud.core2.domain.js
index 32f48faa9aa..4cc34d87a8b 100644
--- a/ui/new/scripts/cloud.core2.domain.js
+++ b/ui/new/scripts/cloud.core2.domain.js
@@ -200,9 +200,7 @@ function domainToRightPanel2(jsonObj) {
 
     listAdminAccounts(domainId);  
 
-	if (isAdmin() || (isDomainAdmin() && (g_domainid != domainId))) {		
-		//comment this out until 6697(resourcetype parameter of ListResourceLimitsCmd should be optional instead of required) is fixed.
-		/*	
+	if (isAdmin() || (isDomainAdmin() && (g_domainid != domainId))) {				
 		var $resourceLimitsTab = $("#right_panel_content #tab_content_resource_limits");	
 		$.ajax({
 			cache: false,				
@@ -245,8 +243,7 @@ function domainToRightPanel2(jsonObj) {
 				}						
 			}
 		});		
-		*/		
-		
+			
 		$("#tab_resource_limits").show();	
 	} 
 	else {
@@ -320,7 +317,7 @@ function doUpdateResourceLimits() {
 	if (!isValid) 
 	    return;
 								
-	var jsonObj = $detailsTab.data("jsonObj");
+	var jsonObj = $("#right_panel_content #tab_content_details").data("jsonObj");
 	var domainId = jsonObj.id;
 	
 	var instanceLimit = trim($resourceLimitsTab.find("#limits_vm_edit").val());