Author: liem_nguyen Date: 2009-12-11 03:28:29 -0500 (Fri, 11 Dec 2009) New Revision: 987 Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/Utils.java portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIAccountEditInputSet.java portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties portal/trunk/webui/eXo/src/main/java/org/exoplatform/webui/organization/UIAccountInputSet.java portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/account/UIAccountProfiles.java Log: GTNPORTAL-384 Not possible to enter accented letter in the user profile Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/Utils.java =================================================================== --- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/Utils.java 2009-12-10 18:38:10 UTC (rev 986) +++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/Utils.java 2009-12-11 08:28:29 UTC (rev 987) @@ -32,7 +32,10 @@ */ public class Utils { + public final static String USER_NAME_VALIDATOR_REGEX = "^[\\p{L}][\\p{L}._\\-\\d]+$"; + public final static String FIRST_CHARACTER_NAME_VALIDATOR_REGEX = "^[\\p{L}][\\p{L}._'\\- \\d]+$"; + public static String join(String separator, String... strings) { if (strings == null) @@ -120,7 +123,7 @@ } else { - Map<K, V> copy = new HashMap<K,V>(map); + Map<K, V> copy = new HashMap<K, V>(map); return Collections.unmodifiableMap(copy); } } Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIAccountEditInputSet.java =================================================================== --- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIAccountEditInputSet.java 2009-12-10 18:38:10 UTC (rev 986) +++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIAccountEditInputSet.java 2009-12-11 08:28:29 UTC (rev 987) @@ -19,6 +19,7 @@ package org.exoplatform.organization.webui.component; +import org.exoplatform.portal.pom.config.Utils; import org.exoplatform.services.organization.OrganizationService; import org.exoplatform.services.organization.User; import org.exoplatform.web.application.ApplicationMessage; @@ -57,16 +58,14 @@ super(name); addUIFormInput(new UIFormStringInput(USERNAME, "userName", null).setEditable(false).addValidator( MandatoryValidator.class).addValidator(StringLengthValidator.class, 3, 30).addValidator( - ResourceValidator.class).addValidator(ExpressionValidator.class, "^[\\p{L}][\\p{L}._\\-\\d]+$", + ResourceValidator.class).addValidator(ExpressionValidator.class, Utils.USER_NAME_VALIDATOR_REGEX, "ResourceValidator.msg.Invalid-char")); addUIFormInput(new UIFormStringInput("firstName", "firstName", null).setMaxLength(45).addValidator( StringLengthValidator.class, 3, 45).addValidator(MandatoryValidator.class).addValidator( - ExpressionValidator.class, "^[\\p{L}][\\p{ASCII}]+$", "FirstCharacterNameValidator.msg").addValidator( - ExpressionValidator.class, "^[\\p{L}][\\p{L}._\\- \\d]+$", "ResourceValidator.msg.Invalid-char")); + ExpressionValidator.class, Utils.FIRST_CHARACTER_NAME_VALIDATOR_REGEX, "FirstCharacterNameValidator.msg")); addUIFormInput(new UIFormStringInput("lastName", "lastName", null).setMaxLength(45).addValidator( StringLengthValidator.class, 3, 45).addValidator(MandatoryValidator.class).addValidator( - ExpressionValidator.class, "^[\\p{L}][\\p{ASCII}]+$", "FirstCharacterNameValidator.msg").addValidator( - ExpressionValidator.class, "^[\\p{L}][\\p{L}._\\- \\d]+$", "ResourceValidator.msg.Invalid-char")); + ExpressionValidator.class, Utils.FIRST_CHARACTER_NAME_VALIDATOR_REGEX, "FirstCharacterNameValidator.msg")); addUIFormInput(new UIFormStringInput("email", "email", null).addValidator(MandatoryValidator.class).addValidator( EmailAddressValidator.class)); UIFormCheckBoxInput<Boolean> uiCheckbox = new UIFormCheckBoxInput<Boolean>(CHANGEPASS, null, false); Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties 2009-12-10 18:38:10 UTC (rev 986) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties 2009-12-11 08:28:29 UTC (rev 987) @@ -211,7 +211,7 @@ #{0}=input field name NameValidator.msg.Invalid-char=Only alpha, digit, dot, dash and underscore characters are allowed for the field "{0}". -FirstCharacterNameValidator.msg=The "{0}" field must start with a character. +FirstCharacterNameValidator.msg=The "{0}" field must start with a character and must not contains special characters. ############################################################################# # Message Info # 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 2009-12-10 18:38:10 UTC (rev 986) +++ portal/trunk/webui/eXo/src/main/java/org/exoplatform/webui/organization/UIAccountInputSet.java 2009-12-11 08:28:29 UTC (rev 987) @@ -19,6 +19,7 @@ package org.exoplatform.webui.organization; +import org.exoplatform.portal.pom.config.Utils; import org.exoplatform.services.organization.OrganizationService; import org.exoplatform.services.organization.Query; import org.exoplatform.services.organization.User; @@ -55,19 +56,17 @@ //setComponentConfig(getClass(), null) ; addUIFormInput(new UIFormStringInput(USERNAME, "userName", null).addValidator(MandatoryValidator.class) .addValidator(StringLengthValidator.class, 3, 30).addValidator(ResourceValidator.class).addValidator( - ExpressionValidator.class, "^[\\p{L}][\\p{L}._\\-\\d]+$", "ResourceValidator.msg.Invalid-char")); + ExpressionValidator.class, Utils.USER_NAME_VALIDATOR_REGEX, "ResourceValidator.msg.Invalid-char")); addUIFormInput(new UIFormStringInput(PASSWORD1X, "password", null).setType(UIFormStringInput.PASSWORD_TYPE) .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, "^[\\p{L}][\\p{ASCII}]+$", - "FirstCharacterNameValidator.msg").addValidator(ExpressionValidator.class, "^[\\p{L}][\\p{L}._\\- \\d]+$", - "ResourceValidator.msg.Invalid-char")); + 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, "^[\\p{L}][\\p{ASCII}]+$", - "FirstCharacterNameValidator.msg").addValidator(ExpressionValidator.class, "^[\\p{L}][\\p{L}._\\- \\d]+$", - "ResourceValidator.msg.Invalid-char")); + 45).addValidator(MandatoryValidator.class).addValidator(ExpressionValidator.class, + Utils.FIRST_CHARACTER_NAME_VALIDATOR_REGEX, "FirstCharacterNameValidator.msg")); addUIFormInput(new UIFormStringInput("email", "email", null).addValidator(MandatoryValidator.class).addValidator( EmailAddressValidator.class)); } Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/account/UIAccountProfiles.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/account/UIAccountProfiles.java 2009-12-10 18:38:10 UTC (rev 986) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/account/UIAccountProfiles.java 2009-12-11 08:28:29 UTC (rev 987) @@ -19,6 +19,7 @@ package org.exoplatform.portal.account; +import org.exoplatform.portal.pom.config.Utils; import org.exoplatform.portal.webui.util.Util; import org.exoplatform.services.organization.OrganizationService; import org.exoplatform.services.organization.User; @@ -62,16 +63,14 @@ UIFormStringInput userName = new UIFormStringInput("userName", "userName", username); userName.setEditable(false); addUIFormInput(userName.addValidator(MandatoryValidator.class).addValidator(StringLengthValidator.class, 3, 30) - .addValidator(ResourceValidator.class).addValidator(ExpressionValidator.class, "^[\\p{L}][\\p{L}._\\-\\d]+$", - "ResourceValidator.msg.Invalid-char")); + .addValidator(ResourceValidator.class).addValidator(ExpressionValidator.class, + Utils.USER_NAME_VALIDATOR_REGEX, "ResourceValidator.msg.Invalid-char")); addUIFormInput(new UIFormStringInput("firstName", "firstName", useraccount.getFirstName()).addValidator( StringLengthValidator.class, 3, 45).addValidator(MandatoryValidator.class).addValidator( - ExpressionValidator.class, "^[\\p{L}][\\p{ASCII}]+$", "FirstCharacterNameValidator.msg").addValidator( - ExpressionValidator.class, "^[\\p{L}][\\p{L}._\\- \\d]+$", "ResourceValidator.msg.Invalid-char")); + ExpressionValidator.class, Utils.FIRST_CHARACTER_NAME_VALIDATOR_REGEX, "FirstCharacterNameValidator.msg")); addUIFormInput(new UIFormStringInput("lastName", "lastName", useraccount.getLastName()).addValidator( StringLengthValidator.class, 3, 45).addValidator(MandatoryValidator.class).addValidator( - ExpressionValidator.class, "^[\\p{L}][\\p{ASCII}]+$", "FirstCharacterNameValidator.msg").addValidator( - ExpressionValidator.class, "^[\\p{L}][\\p{L}._\\- \\d]+$", "ResourceValidator.msg.Invalid-char")); + ExpressionValidator.class, Utils.FIRST_CHARACTER_NAME_VALIDATOR_REGEX, "FirstCharacterNameValidator.msg")); addUIFormInput(new UIFormStringInput("email", "email", useraccount.getEmail()).addValidator( MandatoryValidator.class).addValidator(EmailAddressValidator.class)); }