inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)

Browse Source 
93248: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      93130: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.1)
         93124: Merged DEV to V4.2-BUG-FIX (4.2.5)
            92705 : MNT-12991 : Disabled users can be invited in site
               - Added check for disabled user
               - Added unit test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94946 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2015-01-31 12:14:38 +00:00
parent 744d19fdae
commit 7daae89983
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/alfresco/messages/invitation-service.properties
View File

@@ -7,6 +7,7 @@ invitation.error.not_found="Invitation not found, invitationId: {0}"
invitation.error.not_found_by_invitee="Invitation not found for site: {0}, invitee: {1}" invitation.error.not_found_by_invitee="Invitation not found for site: {0}, invitee: {1}"
invitation.error.invalid_inviteId_format="Invitation Id not valid format, valid formats are <engine>$<id> : {0}" invitation.error.invalid_inviteId_format="Invitation Id not valid format, valid formats are <engine>$<id> : {0}"
invitation.invite.already_member="The user, {0} is already a member of {1} and cannot be invited again" invitation.invite.already_member="The user, {0} is already a member of {1} and cannot be invited again"
invitation.invite.user_disabled="The user, {0} is disabled and cannot be invited"
invitation.cancel.not_site_manager="Current user, {0}, cannot cancel invitation: {1} because they are not a Site Manager for site: {2}" invitation.cancel.not_site_manager="Current user, {0}, cannot cancel invitation: {1} because they are not a Site Manager for site: {2}"
invitation.invite.not_site_manager="Current user, {0}, is not a Site Manager for site: {1}" invitation.invite.not_site_manager="Current user, {0}, is not a Site Manager for site: {1}"
invitation.invite.unable_generate_id="Unable to generate a user name for invitee, which doesn''t already belong to someone else firstName:{0} lastName:{1} email:{2}" invitation.invite.unable_generate_id="Unable to generate a user name for invitee, which doesn''t already belong to someone else firstName:{0} lastName:{1} email:{2}"

14
source/java/org/alfresco/repo/invitation/InvitationServiceImpl.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2005-2013 Alfresco Software Limited. * Copyright (C) 2005-2015 Alfresco Software Limited.
* *
* This file is part of Alfresco * This file is part of Alfresco
* *
@@ -1340,6 +1340,18 @@ public class InvitationServiceImpl implements InvitationService, NodeServicePoli
Object objs[] = { inviteeUserName, inviteeEmail, siteShortName }; Object objs[] = { inviteeUserName, inviteeEmail, siteShortName };
throw new InvitationExceptionUserError("invitation.invite.already_member", objs); throw new InvitationExceptionUserError("invitation.invite.already_member", objs);
}
/**
* throw exception if person is disabled
*/
if (!personService.isEnabled(inviteeUserName))
{
if (logger.isDebugEnabled())
logger.debug("Failed - invitee user is disabled.");
Object objs[] = { inviteeUserName, inviteeEmail, siteShortName };
throw new InvitationExceptionUserError("invitation.invite.user_disabled", objs);
} }
// //