apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

bug 8374: Create User dialog - make email, firstName, lastName required.

Browse Source
This commit is contained in:
Jessica Wang 2011-02-04 15:48:53 -08:00
parent a0e7004cb5
commit 0b34c4965b
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui/jsp/account.jsp
View File

@ -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>

16
ui/scripts/cloud.core.account.js
View File

@ -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);