From b47d843cc1a425bc2367a4894858e6bb1a02bdd2 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Fri, 21 Jan 2011 10:20:39 -0800
Subject: [PATCH] bug 7817: service offering page - apply validateInteger().

---
 ui/scripts/cloud.core.js                 | 5 +++--
 ui/scripts/cloud.core.serviceoffering.js | 6 +++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/ui/scripts/cloud.core.js b/ui/scripts/cloud.core.js
index ca75fa13701..4e1fd3e170b 100644
--- a/ui/scripts/cloud.core.js
+++ b/ui/scripts/cloud.core.js
@@ -1465,13 +1465,14 @@ function validateDropDownBox(label, field, errMsgField, appendErrMsg) {
 }
 
 function validateInteger(label, field, errMsgField, min, max, isOptional) {
-    validateNumber(label, field, errMsgField, min, max, isOptional, "integer");    
+    return validateNumber(label, field, errMsgField, min, max, isOptional, "integer");    
 }
 
 function validateNumber(label, field, errMsgField, min, max, isOptional, type) {
     var isValid = true;
     var errMsg = "";
-    var value = field.val();       
+    var value = field.val();  
+         
 	if (value != null && value.length != 0) {
 		if(isNaN(value)) {
 			errMsg = label + " must be a number";
diff --git a/ui/scripts/cloud.core.serviceoffering.js b/ui/scripts/cloud.core.serviceoffering.js
index be34909a8b1..f358e2c9e58 100644
--- a/ui/scripts/cloud.core.serviceoffering.js
+++ b/ui/scripts/cloud.core.serviceoffering.js
@@ -91,9 +91,9 @@ function initAddServiceOfferingDialog() {
 				var isValid = true;					
 				isValid &= validateString("Name", thisDialog.find("#add_service_name"), thisDialog.find("#add_service_name_errormsg"));
 				isValid &= validateString("Display Text", thisDialog.find("#add_service_display"), thisDialog.find("#add_service_display_errormsg"));
-				isValid &= validateNumber("# of CPU Core", thisDialog.find("#add_service_cpucore"), thisDialog.find("#add_service_cpucore_errormsg"), 1, 1000);		
-				isValid &= validateNumber("CPU", thisDialog.find("#add_service_cpu"), thisDialog.find("#add_service_cpu_errormsg"), 100, 100000);		
-				isValid &= validateNumber("Memory", thisDialog.find("#add_service_memory"), thisDialog.find("#add_service_memory_errormsg"), 64, 1000000);	
+				isValid &= validateInteger("# of CPU Core", thisDialog.find("#add_service_cpucore"), thisDialog.find("#add_service_cpucore_errormsg"), 1, 1000);		
+				isValid &= validateInteger("CPU", thisDialog.find("#add_service_cpu"), thisDialog.find("#add_service_cpu_errormsg"), 100, 100000);		
+				isValid &= validateInteger("Memory", thisDialog.find("#add_service_memory"), thisDialog.find("#add_service_memory_errormsg"), 64, 1000000);	
 				isValid &= validateString("Tags", thisDialog.find("#add_service_tags"), thisDialog.find("#add_service_tags_errormsg"), true);	//optional							
 				if (!isValid) 
 				    return;