Author: mflorea
Date: 2008-01-30 14:16:39 +0100 (Wed, 30 Jan 2008)
New Revision: 7196
Modified:
xwiki-products/curriki/trunk/plugins/invitationmanager/src/main/java/org/xwiki/plugin/invitationmanager/impl/InvitationManagerImpl.java
Log:
CURRIKI-1499: No way to remove old or dead invitations in a 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-30 13:15:34 UTC (rev 7195)
+++
xwiki-products/curriki/trunk/plugins/invitationmanager/src/main/java/org/xwiki/plugin/invitationmanager/impl/InvitationManagerImpl.java
2008-01-30 13:16:39 UTC (rev 7196)
@@ -230,12 +230,15 @@
/**
* [EMAIL PROTECTED]
- *
+ *
* @see InvitationManager#cancelInvitation(String, String, XWikiContext)
*/
- public void cancelInvitation(String user, String space, XWikiContext
context) throws InvitationManagerException {
+ public void cancelInvitation(String userNameOrMail, String space,
XWikiContext context)
+ throws InvitationManagerException
+ {
try {
- Invitation invitation = getInvitation(space, user, context);
+ Invitation invitation =
+ getInvitation(space, getInvitee(userNameOrMail, context),
context);
if (invitation.getStatus().equals(JoinRequestStatus.SENT)) {
invitation.setStatus(JoinRequestStatus.CANCELLED);
invitation.saveWithProgrammingRights();
@@ -1538,4 +1541,15 @@
{
this.mailNotification = mailNotification;
}
+
+ private String getInvitee(String wikiNameOrMailAddress, XWikiContext
context)
+ {
+ wikiNameOrMailAddress = wikiNameOrMailAddress.trim();
+ String registeredUser = getRegisteredUser(wikiNameOrMailAddress,
context);
+ if (registeredUser == null) {
+ return encodeEmailAddress(wikiNameOrMailAddress);
+ } else {
+ return registeredUser;
+ }
+ }
}
_______________________________________________
notifications mailing list
[email protected]
http://lists.xwiki.org/mailman/listinfo/notifications
