Author: mflorea
Date: 2008-01-08 16:07:24 +0100 (Tue, 08 Jan 2008)
New Revision: 6670
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/InvitationManagerPlugin.java
xwiki-products/curriki/trunk/plugins/invitationmanager/src/test/java/org/xwiki/plugin/invitationmanager/impl/InvitationImplTest.java
xwiki-products/curriki/trunk/plugins/invitationmanager/src/test/java/org/xwiki/plugin/invitationmanager/impl/InvitationManagerImplTest.java
xwiki-products/curriki/trunk/plugins/invitationmanager/src/test/java/org/xwiki/plugin/invitationmanager/impl/MembershipRequestImplTest.java
Log:
CURRIKI-1210 + CURRIKI-1321
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-08 14:51:19 UTC (rev 6669)
+++
xwiki-products/curriki/trunk/plugins/invitationmanager/src/main/java/org/xwiki/plugin/invitationmanager/impl/InvitationManagerImpl.java
2008-01-08 15:07:24 UTC (rev 6670)
@@ -66,6 +66,7 @@
public static final String MEMBERSHIP_REQUEST_CLASS_NAME =
"XWiki.MembershipRequestClass";
+ private boolean mailNotification = true;
/**
* [EMAIL PROTECTED]
@@ -1270,6 +1271,10 @@
private void sendMail(String action, JoinRequest request, String
templateDocFullName,
XWikiContext context) throws XWikiException
{
+ if (!mailNotification) {
+ return;
+ }
+
VelocityContext vContext = new VelocityContext();
String spaceName = request.getSpace();
SpaceManager spaceManager =
SpaceManagers.findSpaceManagerForSpace(spaceName, context);
@@ -1506,4 +1511,14 @@
profile.updateProfileFromRequest();
profile.saveWithProgrammingRights();
}
+
+ public boolean isMailNotification()
+ {
+ return mailNotification;
+ }
+
+ public void setMailNotification(boolean mailNotification)
+ {
+ this.mailNotification = mailNotification;
+ }
}
Modified:
xwiki-products/curriki/trunk/plugins/invitationmanager/src/main/java/org/xwiki/plugin/invitationmanager/plugin/InvitationManagerPlugin.java
===================================================================
---
xwiki-products/curriki/trunk/plugins/invitationmanager/src/main/java/org/xwiki/plugin/invitationmanager/plugin/InvitationManagerPlugin.java
2008-01-08 14:51:19 UTC (rev 6669)
+++
xwiki-products/curriki/trunk/plugins/invitationmanager/src/main/java/org/xwiki/plugin/invitationmanager/plugin/InvitationManagerPlugin.java
2008-01-08 15:07:24 UTC (rev 6670)
@@ -47,6 +47,12 @@
public InvitationManagerPlugin(String name, String className, XWikiContext
context)
{
super(name, className, context);
+
+ // move this to InvitationManagerImpl in the near future
+ String mailNotificationCfg =
+
context.getWiki().Param("xwiki.invitationmanager.mailnotification", "1").trim();
+ boolean mailNotification = "1".equals(mailNotificationCfg);
+ ((InvitationManagerImpl)
invitationManager).setMailNotification(mailNotification);
}
/**
Modified:
xwiki-products/curriki/trunk/plugins/invitationmanager/src/test/java/org/xwiki/plugin/invitationmanager/impl/InvitationImplTest.java
===================================================================
---
xwiki-products/curriki/trunk/plugins/invitationmanager/src/test/java/org/xwiki/plugin/invitationmanager/impl/InvitationImplTest.java
2008-01-08 14:51:19 UTC (rev 6669)
+++
xwiki-products/curriki/trunk/plugins/invitationmanager/src/test/java/org/xwiki/plugin/invitationmanager/impl/InvitationImplTest.java
2008-01-08 15:07:24 UTC (rev 6670)
@@ -42,6 +42,7 @@
super.setUp();
manager = new InvitationManagerImpl();
+ manager.setMailNotification(false);
joinRequest = new InvitationImpl(null, null, true, manager, context);
}
Modified:
xwiki-products/curriki/trunk/plugins/invitationmanager/src/test/java/org/xwiki/plugin/invitationmanager/impl/InvitationManagerImplTest.java
===================================================================
---
xwiki-products/curriki/trunk/plugins/invitationmanager/src/test/java/org/xwiki/plugin/invitationmanager/impl/InvitationManagerImplTest.java
2008-01-08 14:51:19 UTC (rev 6669)
+++
xwiki-products/curriki/trunk/plugins/invitationmanager/src/test/java/org/xwiki/plugin/invitationmanager/impl/InvitationManagerImplTest.java
2008-01-08 15:07:24 UTC (rev 6670)
@@ -33,6 +33,7 @@
{
super.setUp();
invitationManager = new InvitationManagerImpl();
+ ((InvitationManagerImpl) invitationManager).setMailNotification(false);
}
protected Invitation createInvitation(String invitee, String space) throws
XWikiException
Modified:
xwiki-products/curriki/trunk/plugins/invitationmanager/src/test/java/org/xwiki/plugin/invitationmanager/impl/MembershipRequestImplTest.java
===================================================================
---
xwiki-products/curriki/trunk/plugins/invitationmanager/src/test/java/org/xwiki/plugin/invitationmanager/impl/MembershipRequestImplTest.java
2008-01-08 14:51:19 UTC (rev 6669)
+++
xwiki-products/curriki/trunk/plugins/invitationmanager/src/test/java/org/xwiki/plugin/invitationmanager/impl/MembershipRequestImplTest.java
2008-01-08 15:07:24 UTC (rev 6670)
@@ -41,6 +41,7 @@
super.setUp();
manager = new InvitationManagerImpl();
+ manager.setMailNotification(false);
joinRequest = new MembershipRequestImpl(null, null, true, manager,
context);
}
_______________________________________________
notifications mailing list
[email protected]
http://lists.xwiki.org/mailman/listinfo/notifications
