Author: kien_nguyen
Date: 2010-06-10 03:58:14 -0400 (Thu, 10 Jun 2010)
New Revision: 3292
Modified:
portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/account/webui/component/UIRegisterInputSet.java
portal/trunk/webui/eXo/src/main/java/org/exoplatform/webui/organization/UIAccountInputSet.java
Log:
GTNPORTAL-1245 Show message wrong when input First/last Name in New Staff page contain
special characters
Modified:
portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/account/webui/component/UIRegisterInputSet.java
===================================================================
---
portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/account/webui/component/UIRegisterInputSet.java 2010-06-10
06:46:05 UTC (rev 3291)
+++
portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/account/webui/component/UIRegisterInputSet.java 2010-06-10
07:58:14 UTC (rev 3292)
@@ -75,13 +75,11 @@
addUIFormInput(new UIFormStringInput(CONFIRM_PASSWORD, CONFIRM_PASSWORD,
null).setType(UIFormStringInput.PASSWORD_TYPE)
.addValidator(MandatoryValidator.class).addValidator(PasswordStringLengthValidator.class,
6, 30));
- addUIFormInput(new UIFormStringInput(FIRST_NAME, FIRST_NAME,
null).addValidator(StringLengthValidator.class, 3,
-
45).addValidator(MandatoryValidator.class).addValidator(ExpressionValidator.class,
Utils.FIRST_CHARACTER_NAME_VALIDATOR_REGEX,
- "FirstCharacterNameValidator.msg"));
+ addUIFormInput(new UIFormStringInput(FIRST_NAME, FIRST_NAME,
null).addValidator(StringLengthValidator.class, 1,
+ 45).addValidator(MandatoryValidator.class));
- addUIFormInput(new UIFormStringInput(LAST_NAME, LAST_NAME,
null).addValidator(StringLengthValidator.class, 3,
-
45).addValidator(MandatoryValidator.class).addValidator(ExpressionValidator.class,
Utils.FIRST_CHARACTER_NAME_VALIDATOR_REGEX,
- "FirstCharacterNameValidator.msg"));
+ addUIFormInput(new UIFormStringInput(LAST_NAME, LAST_NAME,
null).addValidator(StringLengthValidator.class, 1,
+ 45).addValidator(MandatoryValidator.class));
addUIFormInput(new UIFormStringInput(EMAIL_ADDRESS, EMAIL_ADDRESS,
null).addValidator(MandatoryValidator.class).addValidator(
EmailAddressValidator.class));
Modified:
portal/trunk/webui/eXo/src/main/java/org/exoplatform/webui/organization/UIAccountInputSet.java
===================================================================
---
portal/trunk/webui/eXo/src/main/java/org/exoplatform/webui/organization/UIAccountInputSet.java 2010-06-10
06:46:05 UTC (rev 3291)
+++
portal/trunk/webui/eXo/src/main/java/org/exoplatform/webui/organization/UIAccountInputSet.java 2010-06-10
07:58:14 UTC (rev 3292)
@@ -67,12 +67,10 @@
.addValidator(MandatoryValidator.class).addValidator(PasswordStringLengthValidator.class,
6, 30));
addUIFormInput(new UIFormStringInput(PASSWORD2X, "password",
null).setType(UIFormStringInput.PASSWORD_TYPE)
.addValidator(MandatoryValidator.class).addValidator(PasswordStringLengthValidator.class,
6, 30));
- addUIFormInput(new UIFormStringInput("firstName", "firstName",
null).addValidator(StringLengthValidator.class, 3,
-
45).addValidator(MandatoryValidator.class).addValidator(ExpressionValidator.class,
- Utils.FIRST_CHARACTER_NAME_VALIDATOR_REGEX,
"FirstCharacterNameValidator.msg"));
- addUIFormInput(new UIFormStringInput("lastName", "lastName",
null).addValidator(StringLengthValidator.class, 3,
-
45).addValidator(MandatoryValidator.class).addValidator(ExpressionValidator.class,
- Utils.FIRST_CHARACTER_NAME_VALIDATOR_REGEX,
"FirstCharacterNameValidator.msg"));
+ addUIFormInput(new UIFormStringInput("firstName", "firstName",
null).addValidator(StringLengthValidator.class, 1,
+ 45).addValidator(MandatoryValidator.class));
+ addUIFormInput(new UIFormStringInput("lastName", "lastName",
null).addValidator(StringLengthValidator.class, 1,
+ 45).addValidator(MandatoryValidator.class));
addUIFormInput(new UIFormStringInput("email", "email",
null).addValidator(MandatoryValidator.class).addValidator(
EmailAddressValidator.class));
}