inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)

Browse Source 
92322: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      92223: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.1)
         92126: Merged DEV (4.2.4) to V4.2-BUG-FIX (4.2.5)
            90326: MNT-12534: Javascript Mail action does not handle the subjectParams parameter
            Changed MailActionExecuter to use subject parameters as List.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94867 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2015-01-31 11:47:18 +00:00
parent a27004cb42
commit 34c8dba387
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/java/org/alfresco/repo/action/executer/MailActionExecuter.java
View File

@@ -884,8 +884,8 @@ public class MailActionExecuter extends ActionExecuterAbstractBase
// set subject line // set subject line
String subject = (String)ruleAction.getParameterValue(PARAM_SUBJECT); String subject = (String)ruleAction.getParameterValue(PARAM_SUBJECT);
Object[] subjectParams = (Object[])ruleAction.getParameterValue(PARAM_SUBJECT_PARAMS); List<Object> subjectParams = (List<Object>)ruleAction.getParameterValue(PARAM_SUBJECT_PARAMS);
String localizedSubject = getLocalizedSubject(subject, subjectParams, locale); String localizedSubject = getLocalizedSubject(subject, subjectParams.toArray(), locale);
if (locale == null) if (locale == null)
{ {
// process the template against the model // process the template against the model
@@ -954,7 +954,7 @@ public class MailActionExecuter extends ActionExecuterAbstractBase
} catch (Exception e) } catch (Exception e)
{ {
// We're forced to catch java.lang.Exception here. Urgh. // We're forced to catch java.lang.Exception here. Urgh.
if (logger.isInfoEnabled()) if (logger.isWarnEnabled())
{ {
logger.warn("Unable to prepare mail message. Skipping.", e); logger.warn("Unable to prepare mail message. Skipping.", e);
} }