Author: mflorea
Date: 2008-01-09 14:41:08 +0100 (Wed, 09 Jan 2008)
New Revision: 6705
Modified:
xwiki-products/curriki/trunk/plugins/invitationmanager/src/main/java/org/xwiki/plugin/invitationmanager/impl/InvitationManagerImpl.java
Log:
CURRIKI-1210: Group Members - Remove from group
Modified:
xwiki-products/curriki/trunk/plugins/invitationmanager/src/main/java/org/xwiki/plugin/invitationmanager/impl/InvitationManagerImpl.java
===================================================================
---
xwiki-products/curriki/trunk/plugins/invitationmanager/src/main/java/org/xwiki/plugin/invitationmanager/impl/InvitationManagerImpl.java
2008-01-09 12:57:27 UTC (rev 6704)
+++
xwiki-products/curriki/trunk/plugins/invitationmanager/src/main/java/org/xwiki/plugin/invitationmanager/impl/InvitationManagerImpl.java
2008-01-09 13:41:08 UTC (rev 6705)
@@ -868,9 +868,19 @@
// create the invitation object
Invitation invitation = createInvitation(invitee, space, context);
+ // if we get here it means the invitee is not a member of the space
if (!invitation.isNew()) {
- addToAlreadyInvited(invitee, context);
- return false;
+ String status = invitation.getStatus();
+ // maybe it's an old invitation
+ if (JoinRequestStatus.CREATED.equals(status)
+ || JoinRequestStatus.SENT.equals(status)) {
+ // is's a new one
+ addToAlreadyInvited(invitee, context);
+ return false;
+ } else {
+ // is's an old one
+ // in this case we overwrite the invitation
+ }
}
invitation.setInviter(context.getUser());
_______________________________________________
notifications mailing list
[email protected]
http://lists.xwiki.org/mailman/listinfo/notifications
