From a0e7004cb5a1dab708e352ed1dd26aab3df0f8fb Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Fri, 4 Feb 2011 15:39:30 -0800
Subject: [PATCH] bug 8374: Create Account dialog - make email, firstName,
 lastName required.

---
 ui/scripts/cloud.core.account.js | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/ui/scripts/cloud.core.account.js b/ui/scripts/cloud.core.account.js
index 60c4d633d98..2a36dcf7f57 100644
--- a/ui/scripts/cloud.core.account.js
+++ b/ui/scripts/cloud.core.account.js
@@ -155,12 +155,12 @@ function bindAddAccountButton() {
 			    			    			
 				// validate values
 				var isValid = true;					
-				isValid &= validateString("User name", $thisDialog.find("#add_user_username"), $thisDialog.find("#add_user_username_errormsg"), false);   //required
-				isValid &= validateString("Password", $thisDialog.find("#add_user_password"), $thisDialog.find("#add_user_password_errormsg"), false);    //required	
-				isValid &= validateString("Email", $thisDialog.find("#add_user_email"), $thisDialog.find("#add_user_email_errormsg"), true);              //optional	
-				isValid &= validateString("First name", $thisDialog.find("#add_user_firstname"), $thisDialog.find("#add_user_firstname_errormsg"), true); //optional	
-				isValid &= validateString("Last name", $thisDialog.find("#add_user_lastname"), $thisDialog.find("#add_user_lastname_errormsg"), true);    //optional	
-				isValid &= validateString("Account", $thisDialog.find("#add_user_account"), $thisDialog.find("#add_user_account_errormsg"), true);        //optional	
+				isValid &= validateString("User name", $thisDialog.find("#add_user_username"), $thisDialog.find("#add_user_username_errormsg"), false);    //required
+				isValid &= validateString("Password", $thisDialog.find("#add_user_password"), $thisDialog.find("#add_user_password_errormsg"), false);     //required	
+				isValid &= validateString("Email", $thisDialog.find("#add_user_email"), $thisDialog.find("#add_user_email_errormsg"), false);              //required	
+				isValid &= validateString("First name", $thisDialog.find("#add_user_firstname"), $thisDialog.find("#add_user_firstname_errormsg"), false); //required	
+				isValid &= validateString("Last name", $thisDialog.find("#add_user_lastname"), $thisDialog.find("#add_user_lastname_errormsg"), false);    //required	
+				isValid &= validateString("Account", $thisDialog.find("#add_user_account"), $thisDialog.find("#add_user_account_errormsg"), true);         //optional	
 				if (!isValid) 
 				    return;
 				
@@ -173,19 +173,13 @@ function bindAddAccountButton() {
 				var password = $.md5(encodeURIComponent($thisDialog.find("#add_user_password").val()));
 				array1.push("&password="+password);
 				
-				var email = $thisDialog.find("#add_user_email").val();
-				if(email == "")
-					email = username;
+				var email = $thisDialog.find("#add_user_email").val();				
 				array1.push("&email="+todb(email));
 					
-				var firstname = $thisDialog.find("#add_user_firstname").val();
-				if(firstname == "")
-					firstname = username;
+				var firstname = $thisDialog.find("#add_user_firstname").val();				
 				array1.push("&firstname="+todb(firstname));
 					
 				var lastname = $thisDialog.find("#add_user_lastname").val();
-				if(lastname == "")
-					lastname = username;
 			    array1.push("&lastname="+todb(lastname));
 					
 				var account = $thisDialog.find("#add_user_account").val();