From: <cl...@hy...> - 2007-12-05 22:48:12
|
Author: clee Date: 2007-12-05 14:48:06 -0800 (Wed, 05 Dec 2007) New Revision: 7094 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=7094 Modified: trunk/src/org/hyperic/hq/bizapp/server/action/email/EmailAction.java Log: [HHQ-1299] Pass the alert in as well Modified: trunk/src/org/hyperic/hq/bizapp/server/action/email/EmailAction.java =================================================================== --- trunk/src/org/hyperic/hq/bizapp/server/action/email/EmailAction.java 2007-12-05 22:42:14 UTC (rev 7093) +++ trunk/src/org/hyperic/hq/bizapp/server/action/email/EmailAction.java 2007-12-05 22:48:06 UTC (rev 7094) @@ -102,10 +102,11 @@ } private String createSubject(AlertDefinitionInterface alertdef, - Resource resource) { + AlertInterface alert, Resource resource) { Map params = new HashMap(); params.put("resource", resource); params.put("alertDef", alertdef); + params.put("alert", alert); return renderTemplate("subject.gsp", params); } @@ -168,7 +169,7 @@ } } - filter.sendAlert(appEnt, to, createSubject(alertDef, resource), + filter.sendAlert(appEnt, to, createSubject(alertDef, alert, resource), body, htmlBody, alertDef.getPriority(), alertDef.isNotifyFiltered()); @@ -293,8 +294,8 @@ appEnt.getId()); filter.sendAlert(getResource(defInfo), to, - createSubject(defInfo, resource) + " " + - change.getDescription(), + createSubject(defInfo, alert.getAlertInfo(), resource) + + " " + change.getDescription(), messages, messages, defInfo.getPriority(), false); } } |