From ed7417666a476032d28fa5ce8d736473bc767f4d Mon Sep 17 00:00:00 2001 From: Julio Cesar Laura Date: Fri, 12 Feb 2016 16:27:22 -0400 Subject: [PATCH] HOR-174 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Se valido que la respuesta JSON no devuelva un registro vacio innecesario - También se agregó el mensaje por defecto para el listado, cuando no se tienen records --- .../engine/methods/cases/caseMessageHistory_Ajax.php | 12 ++++++++---- .../engine/templates/cases/caseMessageHistory.js | 3 ++- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/workflow/engine/methods/cases/caseMessageHistory_Ajax.php b/workflow/engine/methods/cases/caseMessageHistory_Ajax.php index 9c360f572..5a466f1e0 100755 --- a/workflow/engine/methods/cases/caseMessageHistory_Ajax.php +++ b/workflow/engine/methods/cases/caseMessageHistory_Ajax.php @@ -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 ); } diff --git a/workflow/engine/templates/cases/caseMessageHistory.js b/workflow/engine/templates/cases/caseMessageHistory.js index 365273d2e..2bc4df634 100644 --- a/workflow/engine/templates/cases/caseMessageHistory.js +++ b/workflow/engine/templates/cases/caseMessageHistory.js @@ -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: {