Author: mflorea
Date: 2008-01-15 10:35:34 +0100 (Tue, 15 Jan 2008)
New Revision: 6839
Modified:
xwiki-products/curriki/trunk/plugins/spacemanager/src/main/java/org/xwiki/plugin/spacemanager/api/SpaceManager.java
xwiki-products/curriki/trunk/plugins/spacemanager/src/main/java/org/xwiki/plugin/spacemanager/impl/SpaceManagerImpl.java
Log:
CURRIKI-1399: No Join group confirmation e-mail sent
Modified:
xwiki-products/curriki/trunk/plugins/spacemanager/src/main/java/org/xwiki/plugin/spacemanager/api/SpaceManager.java
===================================================================
---
xwiki-products/curriki/trunk/plugins/spacemanager/src/main/java/org/xwiki/plugin/spacemanager/api/SpaceManager.java
2008-01-15 09:07:42 UTC (rev 6838)
+++
xwiki-products/curriki/trunk/plugins/spacemanager/src/main/java/org/xwiki/plugin/spacemanager/api/SpaceManager.java
2008-01-15 09:35:34 UTC (rev 6839)
@@ -18,6 +18,8 @@
public static interface SpaceAction
{
String CREATE = "Create";
+
+ String JOIN = "Join";
}
public static final String SPACE_DEFAULT_TYPE = "space";
Modified:
xwiki-products/curriki/trunk/plugins/spacemanager/src/main/java/org/xwiki/plugin/spacemanager/impl/SpaceManagerImpl.java
===================================================================
---
xwiki-products/curriki/trunk/plugins/spacemanager/src/main/java/org/xwiki/plugin/spacemanager/impl/SpaceManagerImpl.java
2008-01-15 09:07:42 UTC (rev 6838)
+++
xwiki-products/curriki/trunk/plugins/spacemanager/src/main/java/org/xwiki/plugin/spacemanager/impl/SpaceManagerImpl.java
2008-01-15 09:35:34 UTC (rev 6839)
@@ -1161,18 +1161,24 @@
}
}
- public boolean joinSpace(String spaceName, XWikiContext context) throws
SpaceManagerException {
+ /**
+ * [EMAIL PROTECTED]
+ *
+ * @see SpaceManager#joinSpace(String, XWikiContext)
+ */
+ public boolean joinSpace(String spaceName, XWikiContext context) throws
SpaceManagerException
+ {
try {
- SpaceUserProfile userProfile =
newUserSpaceProfile(context.getUser(), spaceName, context);
+ SpaceUserProfile userProfile =
+ newUserSpaceProfile(context.getUser(), spaceName, context);
userProfile.updateProfileFromRequest();
userProfile.saveWithProgrammingRights();
addMember(spaceName, context.getUser(), context);
+ sendMail(SpaceAction.JOIN, getSpace(spaceName, context), context);
return true;
} catch (XWikiException e) {
throw new SpaceManagerException(e);
}
-
-
}
private void sendMail(String action, Space space, XWikiContext context)
@@ -1193,6 +1199,9 @@
// notify space administrators upon space creation
Collection admins = getAdmins(space.getSpaceName(), context);
toUsers = (String[]) admins.toArray(new String[admins.size()]);
+ } else if (SpaceAction.JOIN.equals(action)) {
+ // send join group confirmation e-mail
+ toUsers = new String[] {context.getUser()};
}
if (fromUser == null) {
_______________________________________________
notifications mailing list
[email protected]
http://lists.xwiki.org/mailman/listinfo/notifications
