zhouxy108/wisemapping-open-source
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor fix.

Browse Source
This commit is contained in:
Paulo Gustavo Veiga
2012-06-14 08:47:23 -03:00
parent 35346bfba2
commit 9836ffdecf
6 changed files with 49 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
wise-webapp/src/main/java/com/wisemapping/mail/NotificationService.java
View File

@@ -57,7 +57,9 @@ final public class NotificationService {
model.put("message", "message");
model.put("ownerName", user.getFirstname());
model.put("mapEditUrl", baseUrl + "/c/maps/" + mindmap.getId() + "/edit");
model.put("baseUrl", baseUrl);
model.put("baseUrl", formMail);
model.put("senderMail", user.getEmail());
mailer.sendEmail(formMail, collabEmail, subject, model, "newCollaboration.vm");
} catch (Exception e) {

4
wise-webapp/src/main/java/com/wisemapping/service/UserServiceImpl.java
View File

@@ -68,7 +68,7 @@ public class UserServiceImpl
model.put("user", user);
model.put("password", password);
mailer.sendEmail(mailer.getRegistrationEmail(), user.getEmail(), "WiseMapping : Recovery Password", model, "recoveryMail.vm");
mailer.sendEmail(mailer.getRegistrationEmail(), user.getEmail(), "WiseMapping : Recovery Password", model, "passwordRecovery.vm");
} else {
throw new InvalidUserEmailException("The email '" + email + "' does not exists.");
}
@@ -134,8 +134,6 @@ public class UserServiceImpl
model.put("emailcheck", activationUrl);
mailer.sendEmail(mailer.getRegistrationEmail(), user.getEmail(), "Welcome to Wisemapping!", model,
"confirmationMail.vm");
mailer.sendEmail(mailer.getRegistrationEmail(), mailer.getRegistrationEmail(), "Wisemapping : New User", model,
"activeUserAccountMail.vm");
}
public void changePassword(User user) {