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

58160: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      57999: MNT-8886: Merged DEV to V4.2-BUG-FIX
         57899: MNT-8886 Users with disabled accounts receive email notification from workflow
               -In prepareEmail.MailActionExecuter() method was added check: (!personService.isEnabled(userAuth)).
               -In AbstractMailActionExecuterTest was added testPrepareEmailForDisabledUsers() test.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61925 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-02-11 22:42:12 +00:00
parent 554e28caca
commit 3d12f9355b
2 changed files with 60 additions and 0 deletions

View File

@@ -649,6 +649,10 @@ public class MailActionExecuter extends ActionExecuterAbstractBase
{
if (personService.personExists(userAuth) == true)
{
if (!personService.isEnabled(userAuth))
{
continue;
}
NodeRef person = personService.getPerson(userAuth);
String address = (String)nodeService.getProperty(person, ContentModel.PROP_EMAIL);
if (address != null && address.length() != 0)