diff --git a/workflow/engine/methods/cases/proxyCasesList.php b/workflow/engine/methods/cases/proxyCasesList.php index 20f37743b..cb5a151d8 100755 --- a/workflow/engine/methods/cases/proxyCasesList.php +++ b/workflow/engine/methods/cases/proxyCasesList.php @@ -320,14 +320,6 @@ $index = $start; while($aRow = $oDataset->getRow()){ //$aRow = $oAppCache->replaceRowUserData($aRow); - // replacing the status data with their respective translation - if( isset($aRow['APP_STATUS']) ){ - $aRow['APP_STATUS'] = G::LoadTranslation("ID_{$aRow['APP_STATUS']}"); - } - // replacing the priority data with their respective translation - if( isset($aRow['DEL_PRIORITY']) ){ - $aRow['DEL_PRIORITY'] = G::LoadTranslation("ID_PRIORITY_{$aPriorities[$aRow['DEL_PRIORITY']]}"); - } /* For participated cases, we want the last step in the case, not only * the last step this user participated. To do that we get every case @@ -357,6 +349,16 @@ if (!isset($aRow['APP_CURRENT_USER'])) $aRow['APP_CURRENT_USER'] = "[Unassigned]"; + + // replacing the status data with their respective translation + if( isset($aRow['APP_STATUS']) ){ + $aRow['APP_STATUS'] = G::LoadTranslation("ID_{$aRow['APP_STATUS']}"); + } + // replacing the priority data with their respective translation + if( isset($aRow['DEL_PRIORITY']) ){ + $aRow['DEL_PRIORITY'] = G::LoadTranslation("ID_PRIORITY_{$aPriorities[$aRow['DEL_PRIORITY']]}"); + } + $rows[] = $aRow; $oDataset->next(); } diff --git a/workflow/engine/templates/cases/casesList.js b/workflow/engine/templates/cases/casesList.js index 405da1936..04d4eb20c 100644 --- a/workflow/engine/templates/cases/casesList.js +++ b/workflow/engine/templates/cases/casesList.js @@ -386,11 +386,7 @@ Ext.onReady ( function() { else return String.format("{0}", value ); } -// note added by krlos pacha carlos[at]colosa[dot]com -// the following function is setting the correct status label in advanced search list. Related 7722 bug - function renderStatus(val,p,r) { - return _('ID_'+val); - } + for(var i = 0, len = columns.length; i < len; i++){ var c = columns[i]; c.renderer = showField; @@ -401,7 +397,6 @@ Ext.onReady ( function() { if( c.id == 'unpauseLink') c.renderer = unpauseLink; if( c.dataIndex == 'CASE_SUMMARY') c.renderer = renderSummary; if( c.dataIndex == 'CASE_NOTES_COUNT') c.renderer = renderNote; - if( c.dataIndex == 'APP_STATUS') c.renderer = renderStatus; } //adding the hidden field DEL_INIT_DATE