From c44fae155268825cc61dd6ce0983f811b3f6bb41 Mon Sep 17 00:00:00 2001 From: j2blake Date: Wed, 13 Jul 2011 22:10:50 +0000 Subject: [PATCH] NIHVIVO-2898 Make the ${siteName} value available to the email templates. --- .../controller/accounts/user/UserAccountsCreatePasswordPage.java | 1 + .../accounts/user/UserAccountsFirstTimeExternalPageStrategy.java | 1 + .../accounts/user/UserAccountsMyAccountPageStrategy.java | 1 + .../controller/accounts/user/UserAccountsResetPasswordPage.java | 1 + 4 files changed, 4 insertions(+) diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/user/UserAccountsCreatePasswordPage.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/user/UserAccountsCreatePasswordPage.java index 40ae4d6d0..ab8aaba4f 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/user/UserAccountsCreatePasswordPage.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/user/UserAccountsCreatePasswordPage.java @@ -57,6 +57,7 @@ public class UserAccountsCreatePasswordPage extends private void notifyUser() { Map body = new HashMap(); body.put("userAccount", userAccount); + body.put("siteName", getSiteName()); FreemarkerEmailMessage email = FreemarkerEmailFactory .createNewMessage(vreq); diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/user/UserAccountsFirstTimeExternalPageStrategy.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/user/UserAccountsFirstTimeExternalPageStrategy.java index 975551fdc..79ee65e1d 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/user/UserAccountsFirstTimeExternalPageStrategy.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/user/UserAccountsFirstTimeExternalPageStrategy.java @@ -68,6 +68,7 @@ public abstract class UserAccountsFirstTimeExternalPageStrategy extends public void notifyUser(UserAccount ua) { Map body = new HashMap(); body.put("userAccount", ua); + body.put("siteName", getSiteName()); FreemarkerEmailMessage email = FreemarkerEmailFactory .createNewMessage(vreq); diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/user/UserAccountsMyAccountPageStrategy.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/user/UserAccountsMyAccountPageStrategy.java index 4a1435db3..6d72a941e 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/user/UserAccountsMyAccountPageStrategy.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/user/UserAccountsMyAccountPageStrategy.java @@ -173,6 +173,7 @@ public abstract class UserAccountsMyAccountPageStrategy extends Map body = new HashMap(); body.put("userAccount", page.getUserAccount()); + body.put("siteName", getSiteName()); FreemarkerEmailMessage email = FreemarkerEmailFactory .createNewMessage(vreq); diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/user/UserAccountsResetPasswordPage.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/user/UserAccountsResetPasswordPage.java index f1ec8ed52..c5d8a3c03 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/user/UserAccountsResetPasswordPage.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/user/UserAccountsResetPasswordPage.java @@ -57,6 +57,7 @@ public class UserAccountsResetPasswordPage extends UserAccountsPasswordBasePage private void notifyUser() { Map body = new HashMap(); body.put("userAccount", userAccount); + body.put("siteName", getSiteName()); FreemarkerEmailMessage email = FreemarkerEmailFactory .createNewMessage(vreq);