fernando/luos
1
0
Fork 0
Code Releases Activity

Merged in julceslau/processmaker/HOR-174 (pull request #3705)

Browse Source 
HOR-174
This commit is contained in:
Julio Cesar Laura Avendaño
2016-02-15 16:50:18 -04:00
parent 1f5f942ea3 ed7417666a
commit b94f624b5a
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
workflow/engine/methods/cases/caseMessageHistory_Ajax.php
View File

@@ -122,11 +122,15 @@ if ($actionAjax == 'messageHistoryGridList_JXP') {
$r->data = $aProcesses;
$r->totalCount = $totalCount;
if (!isset($r->data[0])) {
$r->data[0] = array('APP_MSG_TYPE' => '');
}
if (!empty($aProcesses)) {
if (!isset($r->data[0])) {
$r->data[0] = array('APP_MSG_TYPE' => '');
}
$r->data[0]["APP_MSG_TYPE"] = (array_key_exists($r->data[0]["APP_MSG_TYPE"], $arrayToTranslation))? $arrayToTranslation[$r->data[0]["APP_MSG_TYPE"]] : $r->data[0]["APP_MSG_TYPE"];
$r->data[0]["APP_MSG_TYPE"] = (array_key_exists($r->data[0]["APP_MSG_TYPE"], $arrayToTranslation)) ?
$arrayToTranslation[$r->data[0]["APP_MSG_TYPE"]] :
$r->data[0]["APP_MSG_TYPE"];
}
echo G::json_encode( $r );
}

3
workflow/engine/templates/cases/caseMessageHistory.js
View File

@@ -417,7 +417,8 @@ var ActionTabFrameGlobal = '';
// cls : 'grid_with_checkbox',
columnLines: true,
viewConfig: {
forceFit:true
forceFit:true,
emptyText: (_('ID_NO_RECORDS_FOUND'))
},
cm: new Ext.grid.ColumnModel({
defaults: {