From 2f51dbacda8ddba97255443cb178fa83ca6cd148 Mon Sep 17 00:00:00 2001 From: Kevin Roast Date: Wed, 15 Feb 2006 18:24:07 +0000 Subject: [PATCH] . Fix for unreported issue, where Inviting a Group with a Role does not show the Role in brackets after selection. . Fix for AWC-521 - Creating a new group with certain characters is not allowed . Upgrade of MySQL JConnector JAR to latest: mysql-connector-java-3.1.12-bin.jar git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2395 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- config/alfresco/messages/webclient.properties | 1 + .../java/org/alfresco/web/bean/wizard/InviteUsersWizard.java | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/config/alfresco/messages/webclient.properties b/config/alfresco/messages/webclient.properties index e18bab84de..0123a61355 100644 --- a/config/alfresco/messages/webclient.properties +++ b/config/alfresco/messages/webclient.properties @@ -392,6 +392,7 @@ title_add_user_group=Add User to Group add_user_group_description=Add an existing User to a Group select_users=Select Users to add to this Group selected_users=Selected Users +groups_err_group_name=Group ID cannot contain the characters: {0} # Invite Users Wizard messages invite_title=Invite Users Wizard diff --git a/source/java/org/alfresco/web/bean/wizard/InviteUsersWizard.java b/source/java/org/alfresco/web/bean/wizard/InviteUsersWizard.java index 375eef26b7..b85a176e07 100644 --- a/source/java/org/alfresco/web/bean/wizard/InviteUsersWizard.java +++ b/source/java/org/alfresco/web/bean/wizard/InviteUsersWizard.java @@ -477,7 +477,10 @@ public abstract class InviteUsersWizard extends AbstractWizardBean else { // found a group authority - label.append(authority.substring(PermissionService.GROUP_PREFIX.length())); + label.append(authority.substring(PermissionService.GROUP_PREFIX.length())) + .append(" (") + .append(Application.getMessage(FacesContext.getCurrentInstance(), role)) + .append(")"); } this.userGroupRoles.add(new UserGroupRole(authority, role, label.toString()));