From 5a9059ba2aa71b4b221db78b9b6dbdb32b44a8f7 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Mon, 1 Nov 2010 20:59:43 -0700
Subject: [PATCH] new UI - fix a bug that account failed to udpate resource
 limit ("resourcetype is wrong).

---
 ui/new/scripts/cloud.core2.account.js | 16 ++++++++--------
 ui/new/scripts/cloud.core2.domain.js  | 18 +++++++++---------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/ui/new/scripts/cloud.core2.account.js b/ui/new/scripts/cloud.core2.account.js
index 648fdf75d71..e325fd290ed 100644
--- a/ui/new/scripts/cloud.core2.account.js
+++ b/ui/new/scripts/cloud.core2.account.js
@@ -92,7 +92,7 @@ function accountJsonToDetailsTab($midmenuItem1) {
 
 var accountActionMap = {  
     "Resource limits": {                 
-        dialogBeforeActionFn : doResourceLimits 
+        dialogBeforeActionFn : doResourceLimitsForAccount 
     } 
     ,
     "Disable account": {              
@@ -160,7 +160,7 @@ var accountActionMap = {
     }    
 }; 
 
-function updateResourceLimit(domainId, account, type, max) {
+function updateResourceLimitForAccount(domainId, account, type, max) {
 	$.ajax({
 	    data: createURL("command=updateResourceLimit&domainid="+domainId+"&account="+account+"&resourceType="+type+"&max="+max),
 		dataType: "json",
@@ -169,7 +169,7 @@ function updateResourceLimit(domainId, account, type, max) {
 	});
 }
 
-function doResourceLimits($actionLink, $detailsTab, $midmenuItem1) {
+function doResourceLimitsForAccount($actionLink, $detailsTab, $midmenuItem1) {
     var $detailsTab = $("#right_panel_content #tab_content_details");  
 	var jsonObj = $detailsTab.data("jsonObj");
 	var domainId = jsonObj.domainid;
@@ -228,19 +228,19 @@ function doResourceLimits($actionLink, $detailsTab, $midmenuItem1) {
 											
 					$(this).dialog("close"); 
 					if (instanceLimit != preInstanceLimit) {
-						updateResourceLimit(domainId, account, 0, instanceLimit);
+						updateResourceLimitForAccount(domainId, account, 0, instanceLimit);
 					}
 					if (ipLimit != preIpLimit) {
-						updateResourceLimit(domainId, account, 1, ipLimit);
+						updateResourceLimitForAccount(domainId, account, 1, ipLimit);
 					}
 					if (diskLimit != preDiskLimit) {
-						updateResourceLimit(domainId, account, 2, diskLimit);
+						updateResourceLimitForAccount(domainId, account, 2, diskLimit);
 					}
 					if (snapshotLimit != preSnapshotLimit) {
-						updateResourceLimit(domainId, account, 3, snapshotLimit);
+						updateResourceLimitForAccount(domainId, account, 3, snapshotLimit);
 					}
 					if (templateLimit != preTemplateLimit) {
-						updateResourceLimit(domainId, account, 4, templateLimit);
+						updateResourceLimitForAccount(domainId, account, 4, templateLimit);
 					}
 				}, 
 				"Cancel": function() { 
diff --git a/ui/new/scripts/cloud.core2.domain.js b/ui/new/scripts/cloud.core2.domain.js
index 4cc34d87a8b..2814ada26ec 100644
--- a/ui/new/scripts/cloud.core2.domain.js
+++ b/ui/new/scripts/cloud.core2.domain.js
@@ -32,7 +32,7 @@ function afterLoadDomainJSP() {
     var $resourceLimitsTab = $("#right_panel_content #tab_content_resource_limits");	
     var $readonlyFields  =  $resourceLimitsTab.find("#limits_vm, #limits_ip, #limits_volume, #limits_snapshot, #limits_template");
     var $editFields =  $resourceLimitsTab.find("#limits_vm_edit, #limits_ip_edit, #limits_volume_edit, #limits_snapshot_edit, #limits_template_edit");   
-    initializeEditFunction($readonlyFields, $editFields, doUpdateResourceLimits);    
+    initializeEditFunction($readonlyFields, $editFields, doUpdateResourceLimitsForDomain);    
 }
 
 
@@ -142,7 +142,7 @@ function domainToRightPanel(jsonObj) {
             var $resourceLimitsTab = $("#right_panel_content #tab_content_resource_limits");	
             var $readonlyFields  =  $resourceLimitsTab.find("#limits_vm, #limits_ip, #limits_volume, #limits_snapshot, #limits_template");
             var $editFields =  $resourceLimitsTab.find("#limits_vm_edit, #limits_ip_edit, #limits_volume_edit, #limits_snapshot_edit, #limits_template_edit");   
-            initializeEditFunction($readonlyFields, $editFields, doUpdateResourceLimits);    
+            initializeEditFunction($readonlyFields, $editFields, doUpdateResourceLimitsForDomain);    
                 
 			domainToRightPanel2(jsonObj);       
 		});        
@@ -274,7 +274,7 @@ function bindEventHandlerToDomainTreeNode() {
     });
 }
 
-function updateResourceLimit(domainId, type, max, $readonlyField) {
+function updateResourceLimitForDomain(domainId, type, max, $readonlyField) {
 	$.ajax({
 	    data: createURL("command=updateResourceLimit&domainid="+domainId+"&resourceType="+type+"&max="+max),
 		dataType: "json",
@@ -305,7 +305,7 @@ function listAdminAccounts(domainId) {
 	});		
 }		
 
-function doUpdateResourceLimits() {
+function doUpdateResourceLimitsForDomain() {
     var $resourceLimitsTab = $("#right_panel_content #tab_content_resource_limits");
 
     var isValid = true;	        			
@@ -327,18 +327,18 @@ function doUpdateResourceLimits() {
 	var templateLimit = trim($resourceLimitsTab.find("#limits_template_edit").val());
 				
 	if (instanceLimit != $resourceLimitsTab.find("#limits_vm").text()) {
-		updateResourceLimit(domainId, 0, instanceLimit, $resourceLimitsTab.find("#limits_vm"));
+		updateResourceLimitForDomain(domainId, 0, instanceLimit, $resourceLimitsTab.find("#limits_vm"));
 	}
 	if (ipLimit != $resourceLimitsTab.find("#limits_ip").text()) {
-		updateResourceLimit(domainId, 1, ipLimit, $resourceLimitsTab.find("#limits_ip"));
+		updateResourceLimitForDomain(domainId, 1, ipLimit, $resourceLimitsTab.find("#limits_ip"));
 	}
 	if (diskLimit != $resourceLimitsTab.find("#limits_volume").text()) {
-		updateResourceLimit(domainId, 2, diskLimit, $resourceLimitsTab.find("#limits_volume"));
+		updateResourceLimitForDomain(domainId, 2, diskLimit, $resourceLimitsTab.find("#limits_volume"));
 	}
 	if (snapshotLimit != $resourceLimitsTab.find("#limits_snapshot").text()) {
-		updateResourceLimit(domainId, 3, snapshotLimit, $resourceLimitsTab.find("#limits_snapshot"));
+		updateResourceLimitForDomain(domainId, 3, snapshotLimit, $resourceLimitsTab.find("#limits_snapshot"));
 	}
 	if (templateLimit != $resourceLimitsTab.find("#limits_template").text()) {
-		updateResourceLimit(domainId, 4, templateLimit, $resourceLimitsTab.find("#limits_template"));
+		updateResourceLimitForDomain(domainId, 4, templateLimit, $resourceLimitsTab.find("#limits_template"));
 	}    
 }
\ No newline at end of file