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

BUG 8099 "La opción status en Reassign, se vi..." SOLVED

Browse Source 
- the translation was being overwritten, but it is fixed now
This commit is contained in:
Erik Amaru Ortiz
2011-11-29 12:55:02 -04:00
parent 35bf13be36
commit 4bbf5a48e6
2 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
workflow/engine/methods/cases/proxyCasesList.php
View File

@@ -320,14 +320,6 @@
$index = $start; $index = $start;
while($aRow = $oDataset->getRow()){ while($aRow = $oDataset->getRow()){
//$aRow = $oAppCache->replaceRowUserData($aRow); //$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 /* 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 * the last step this user participated. To do that we get every case
@@ -357,6 +349,16 @@
if (!isset($aRow['APP_CURRENT_USER'])) if (!isset($aRow['APP_CURRENT_USER']))
$aRow['APP_CURRENT_USER'] = "[Unassigned]"; $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; $rows[] = $aRow;
$oDataset->next(); $oDataset->next();
} }

7
workflow/engine/templates/cases/casesList.js
View File

@@ -386,11 +386,7 @@ Ext.onReady ( function() {
else else
return String.format("<span class='row_updated'>{0}</span>", value ); return String.format("<span class='row_updated'>{0}</span>", 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++){ for(var i = 0, len = columns.length; i < len; i++){
var c = columns[i]; var c = columns[i];
c.renderer = showField; c.renderer = showField;
@@ -401,7 +397,6 @@ Ext.onReady ( function() {
if( c.id == 'unpauseLink') c.renderer = unpauseLink; if( c.id == 'unpauseLink') c.renderer = unpauseLink;
if( c.dataIndex == 'CASE_SUMMARY') c.renderer = renderSummary; if( c.dataIndex == 'CASE_SUMMARY') c.renderer = renderSummary;
if( c.dataIndex == 'CASE_NOTES_COUNT') c.renderer = renderNote; if( c.dataIndex == 'CASE_NOTES_COUNT') c.renderer = renderNote;
if( c.dataIndex == 'APP_STATUS') c.renderer = renderStatus;
} }
//adding the hidden field DEL_INIT_DATE //adding the hidden field DEL_INIT_DATE