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

---
 ui/jsp/account.jsp               |  2 +-
 ui/scripts/cloud.core.account.js | 16 +++++-----------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/ui/jsp/account.jsp b/ui/jsp/account.jsp
index 045312ec62c..8d2160bdaf3 100644
--- a/ui/jsp/account.jsp
+++ b/ui/jsp/account.jsp
@@ -445,7 +445,7 @@ dictionary = {
             </li>
             <li>
                 <label for="add_user_account">
-                    <fmt:message key="label.account"/>:</label>
+                    <fmt:message key="label.account.name"/>:</label>
                 <input class="text" type="text" id="add_user_account" />
                 <div id="add_user_account_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
                 </div>
diff --git a/ui/scripts/cloud.core.account.js b/ui/scripts/cloud.core.account.js
index 2a36dcf7f57..7a20519f347 100644
--- a/ui/scripts/cloud.core.account.js
+++ b/ui/scripts/cloud.core.account.js
@@ -257,11 +257,11 @@ function bindAddUserButton() {
 			    		    			
 				// 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("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				
 				if (!isValid) 
 				    return;
 				
@@ -275,18 +275,12 @@ function bindAddUserButton() {
 				array1.push("&password="+password);
 				
 				var email = $thisDialog.find("#add_user_email").val();
-				if(email == "")
-					email = username;
 				array1.push("&email="+todb(email));
 					
 				var firstname = $thisDialog.find("#add_user_firstname").val();
-				if(firstname == "")
-					firstname = username;
 				array1.push("&firstname="+todb(firstname));
 					
 				var lastname = $thisDialog.find("#add_user_lastname").val();
-				if(lastname == "")
-					lastname = username;
 			    array1.push("&lastname="+todb(lastname));
 									
 			    array1.push("&domainid="+accountObj.domainid);