mirror of https://github.com/apache/cloudstack.git
bug 8374: Create Account dialog - make email, firstName, lastName required.
This commit is contained in:
parent
0b8d5c66ad
commit
a0e7004cb5
|
|
@ -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();
|
||||
|
|
|
|||
Loading…
Reference in New Issue