fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged in release/3.5.7 (pull request #7637)

Browse Source 
Merge "release/3.5.7" to "develop" branch

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
This commit is contained in:
Julio Cesar Laura Avendaño
2020-12-17 20:08:07 +00:00
parent bc8a397dc3 45f0105523
commit fd17dd2c24
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
workflow/engine/methods/mails/emailsAjax.php
View File

@@ -133,8 +133,6 @@ switch ($req) {
$row = $result->getRow(); $row = $result->getRow();
$row['APP_MSG_STATUS'] = ucfirst($row['APP_MSG_STATUS']); $row['APP_MSG_STATUS'] = ucfirst($row['APP_MSG_STATUS']);
$row['APP_MSG_DATE'] = DateTime::convertUtcToTimeZone($row['APP_MSG_DATE']); $row['APP_MSG_DATE'] = DateTime::convertUtcToTimeZone($row['APP_MSG_DATE']);
$row['APP_MSG_TO'] = htmlentities($row['APP_MSG_TO'], ENT_HTML5, "UTF-8");
$row['APP_MSG_ERROR'] = htmlentities($row['APP_MSG_ERROR'], ENT_HTML5, "UTF-8");
switch ($filterBy) { switch ($filterBy) {
case 'CASES': case 'CASES':

3
workflow/engine/templates/mails/emailList.js
View File

@@ -54,6 +54,9 @@ Ext.onReady(function(){
data = PMExt.emailConst.numberColumn.defaultValue; data = PMExt.emailConst.numberColumn.defaultValue;
} }
} }
if (metadata.id === 'APP_MSG_TO' || metadata.id === 'APP_MSG_ERROR') {
return Ext.util.Format.htmlEncode(data);
}
var new_text = metadata.style.split(';'); var new_text = metadata.style.split(';');
var style = ''; var style = '';
for (var i = 0; i < new_text.length -1 ; i++) { for (var i = 0; i < new_text.length -1 ; i++) {