From 9c0cd7f6397bccb752f6a89bffc82f6a7025ad15 Mon Sep 17 00:00:00 2001 From: j2blake Date: Fri, 8 Jul 2011 15:04:55 +0000 Subject: [PATCH] NIHVIVO-2845 the siteName was missing from the Freemarker body map. It was required by the email template. --- .../vitro/webapp/controller/accounts/UserAccountsPage.java | 6 ++++++ .../accounts/admin/UserAccountsAddPageStrategy.java | 1 + .../accounts/admin/UserAccountsEditPageStrategy.java | 5 ----- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/UserAccountsPage.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/UserAccountsPage.java index fe3ed3ea4..4b5bab338 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/UserAccountsPage.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/UserAccountsPage.java @@ -20,6 +20,7 @@ import org.apache.commons.logging.LogFactory; import com.hp.hpl.jena.ontology.OntModel; +import edu.cornell.mannlib.vitro.webapp.beans.ApplicationBean; import edu.cornell.mannlib.vitro.webapp.beans.PermissionSet; import edu.cornell.mannlib.vitro.webapp.beans.UserAccount; import edu.cornell.mannlib.vitro.webapp.beans.VClass; @@ -186,4 +187,9 @@ public abstract class UserAccountsPage { && pw.length() <= UserAccount.MAX_PASSWORD_LENGTH; } + protected String getSiteName() { + ApplicationBean appBean = vreq.getAppBean(); + return appBean.getApplicationName(); + } + } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/admin/UserAccountsAddPageStrategy.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/admin/UserAccountsAddPageStrategy.java index fe1e1c489..3e8ac9597 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/admin/UserAccountsAddPageStrategy.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/admin/UserAccountsAddPageStrategy.java @@ -92,6 +92,7 @@ public abstract class UserAccountsAddPageStrategy extends UserAccountsPage { Map body = new HashMap(); body.put("userAccount", page.getAddedAccount()); body.put("passwordLink", buildCreatePasswordLink()); + body.put("siteName", getSiteName()); FreemarkerEmailMessage email = FreemarkerEmailFactory .createNewMessage(vreq); diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/admin/UserAccountsEditPageStrategy.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/admin/UserAccountsEditPageStrategy.java index 163d3cdda..c71029fc5 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/admin/UserAccountsEditPageStrategy.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/admin/UserAccountsEditPageStrategy.java @@ -116,11 +116,6 @@ public abstract class UserAccountsEditPageStrategy extends UserAccountsPage { sentEmail = true; } - private String getSiteName() { - ApplicationBean appBean = vreq.getAppBean(); - return appBean.getApplicationName(); - } - private String buildResetPasswordLink() { try { String email = page.getUpdatedAccount().getEmailAddress();