Author: mflorea
Date: 2008-01-16 14:10:55 +0100 (Wed, 16 Jan 2008)
New Revision: 6863
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/plugin/InvitationManagerPluginApi.java
Log:
CURRIKI-1206: Group Members - Reject membership request notification email
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-16 12:34:01 UTC (rev 6862)
+++
xwiki-products/curriki/trunk/plugins/invitationmanager/src/main/java/org/xwiki/plugin/invitationmanager/impl/InvitationManagerImpl.java
2008-01-16 13:10:55 UTC (rev 6863)
@@ -1374,6 +1374,7 @@
XWikiDocument translatedMailDoc =
mailDoc.getTranslatedDocument(context);
mailSender.prepareVelocityContext(fromUser, strToUsers, "", vContext,
context);
vContext.put("xwiki", new XWiki(context.getWiki(), context));
+ vContext.put("context", new com.xpn.xwiki.api.Context(context));
String mailSubject =
XWikiVelocityRenderer.evaluate(translatedMailDoc.getTitle(),
templateDocFullName,
vContext);
Modified:
xwiki-products/curriki/trunk/plugins/invitationmanager/src/main/java/org/xwiki/plugin/invitationmanager/plugin/InvitationManagerPluginApi.java
===================================================================
---
xwiki-products/curriki/trunk/plugins/invitationmanager/src/main/java/org/xwiki/plugin/invitationmanager/plugin/InvitationManagerPluginApi.java
2008-01-16 12:34:01 UTC (rev 6862)
+++
xwiki-products/curriki/trunk/plugins/invitationmanager/src/main/java/org/xwiki/plugin/invitationmanager/plugin/InvitationManagerPluginApi.java
2008-01-16 13:10:55 UTC (rev 6863)
@@ -276,10 +276,19 @@
* If the context user is not an administrator of the space, does nothing
and log a warning in
* the context.
*/
- public void rejectMembership(String space, String userName) throws
InvitationManagerException {
+ public boolean rejectMembership(String space, String userName)
+ {
+ context.remove("InvitationManagerException");
if (hasProgrammingRights()) {
- getInvitationManager().rejectMembership(space, userName, context);
+ try {
+ getInvitationManager().rejectMembership(space, userName,
context);
+ return true;
+ } catch (InvitationManagerException e) {
+ context.put("InvitationManagerException", e);
+ return false;
+ }
}
+ return false;
}
/**
@@ -289,10 +298,19 @@
*
* @see #rejectMembership(String, String)
*/
- public void rejectMembership(String space, String userName, String
templateMail) throws InvitationManagerException {
+ public boolean rejectMembership(String space, String userName, String
templateMail)
+ {
+ context.remove("InvitationManagerException");
if (hasProgrammingRights()) {
- getInvitationManager().rejectMembership(space, userName,
templateMail, context);
+ try {
+ getInvitationManager().rejectMembership(space, userName,
templateMail, context);
+ return true;
+ } catch (InvitationManagerException e) {
+ context.put("InvitationManagerException", e);
+ return false;
+ }
}
+ return false;
}
/**
_______________________________________________
notifications mailing list
[email protected]
http://lists.xwiki.org/mailman/listinfo/notifications
