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 V3.2 to HEAD:

Browse Source 
16713: ETHREEOH-2379 deployment missing crypto libraries.
    16722: ETHREEOH-2798 - java.lang.NullPointerException while deleting a folder node with emptyTranslation
    16752: ETHREEOH-2946 - Release a test server from inside an Approve/Reject task
    16796: ETHREEOH-1841 - MBean error when running in a WebSphere cluster
    16920: ETHREEOH-2796 - Word 97 To Text transformation fails
    16955: Merge V3.1 to V3.2
        14275: Invitation change for ETHREEOH-1456, Missed change from check in 14222.
        14222: ETHREEOH-1456 - accepting a rejected invitation.
    16963: ETHREEOH-3029 - Strange defaltOnLoadListsner in hibernate-context.xml

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16966 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Mark Rogers
2009-10-15 14:03:12 +00:00
parent 94fb4a09ae
commit 65f4462094
2 changed files with 24 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
source/java/org/alfresco/repo/web/scripts/invite/InviteResponse.java
View File

@@ -134,6 +134,9 @@ public class InviteResponse extends DeclarativeWebScript
String inviteId = req.getServiceMatch().getTemplateVars().get("inviteId");
String inviteTicket = req.getServiceMatch().getTemplateVars().get("inviteTicket");
// Check that the task is still open.
//if(inviteStart)
// process response
String action = req.getServiceMatch().getTemplateVars().get("action");
if (action.equals("accept"))
@@ -149,6 +152,10 @@ public class InviteResponse extends DeclarativeWebScript
{
throw new WebScriptException(Status.STATUS_FORBIDDEN, fe.toString());
}
catch (InvitationExceptionUserError fe)
{
throw new WebScriptException(Status.STATUS_CONFLICT, fe.toString());
}
}
else if (action.equals("reject"))
{
@@ -163,6 +170,10 @@ public class InviteResponse extends DeclarativeWebScript
{
throw new WebScriptException(Status.STATUS_FORBIDDEN, fe.toString());
}
catch (InvitationExceptionUserError fe)
{
throw new WebScriptException(Status.STATUS_CONFLICT, fe.toString());
}
}
else
{

12
source/java/org/alfresco/repo/web/scripts/invite/InviteServiceTest.java
View File

@@ -583,6 +583,13 @@ public class InviteServiceTest extends BaseWebScriptTest
String acceptInviteUrl = URL_INVITE + "/" + inviteId + "/" + inviteTicket + "/accept";
sendRequest(new PutRequest(acceptInviteUrl, (byte[])null, null), Status.STATUS_OK);
// Invitee attempts to accept the invitation again
sendRequest(new PutRequest(acceptInviteUrl, (byte[])null, null), Status.STATUS_CONFLICT);
// Invitee attempts to reject an invitation that has already been accepted.
rejectInvite(inviteId, inviteTicket, Status.STATUS_CONFLICT);
//
// test that invitation represented by invite ID (of invitation started
// above)
@@ -611,6 +618,9 @@ public class InviteServiceTest extends BaseWebScriptTest
rejectInvite(inviteId, inviteTicket, Status.STATUS_OK);
// Negative test
rejectInvite(inviteId, inviteTicket, Status.STATUS_CONFLICT);
//
// test that invite represented by invite ID (of invitation started
// above)
@@ -624,6 +634,8 @@ public class InviteServiceTest extends BaseWebScriptTest
// there should no longer be any invites identified by invite ID pending
// assertEquals(0, getInvitesResult.getJSONArray("invites").length());
}
public void testGetInvitesByInviteId() throws Exception