fernando/luos
1
0
Fork 0
Code Releases Activity

Merged in marcoAntonioNina/processmaker/BUG-15567 (pull request #702)

Browse Source 
BUG-15567 Cases List Problema con los idiomas al traducir... IMPROVEMENT
This commit is contained in:
Julio Cesar Laura Avendaño
2014-08-21 17:15:19 -04:00
parent e5b20363ab 7651b102a3
commit 9a70500096
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
workflow/engine/methods/cases/casesListExtJs.php
View File

@@ -101,7 +101,9 @@ $allUsers = getAllUsersArray( $action );
$oHeadPublisher->assign( 'reassignReaderFields', $reassignReaderFields ); //sending the fields to get from proxy $oHeadPublisher->assign( 'reassignReaderFields', $reassignReaderFields ); //sending the fields to get from proxy
$oHeadPublisher->addExtJsScript( 'cases/reassignList', false ); $oHeadPublisher->addExtJsScript( 'cases/reassignList', false );
$enableEnterprise = false;
if (class_exists( 'enterprisePlugin' )) { if (class_exists( 'enterprisePlugin' )) {
$enableEnterprise = true;
$oHeadPublisher->addExtJsScript(PATH_PLUGINS . "enterprise" . PATH_SEP . "advancedTools" . PATH_SEP , false, true); $oHeadPublisher->addExtJsScript(PATH_PLUGINS . "enterprise" . PATH_SEP . "advancedTools" . PATH_SEP , false, true);
} }
@@ -117,6 +119,7 @@ $oHeadPublisher->assign( 'categoryValues', $category ); //Sending the listing of
$oHeadPublisher->assign( 'userValues', $users ); //Sending the listing of users $oHeadPublisher->assign( 'userValues', $users ); //Sending the listing of users
$oHeadPublisher->assign( 'allUsersValues', $allUsers ); //Sending the listing of all users $oHeadPublisher->assign( 'allUsersValues', $allUsers ); //Sending the listing of all users
$oHeadPublisher->assign( 'solrEnabled', $solrEnabled ); //Sending the status of solar $oHeadPublisher->assign( 'solrEnabled', $solrEnabled ); //Sending the status of solar
$oHeadPublisher->assign( 'enableEnterprise', $enableEnterprise ); //sending the page size
//menu permissions //menu permissions
/*$c = new Criteria('workflow'); /*$c = new Criteria('workflow');

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

@@ -591,7 +591,9 @@ Ext.onReady ( function() {
if( c.dataIndex == 'APP_DEL_PREVIOUS_USER') c.renderer = previous_full_name; if( c.dataIndex == 'APP_DEL_PREVIOUS_USER') c.renderer = previous_full_name;
if( c.dataIndex == 'APP_CURRENT_USER') c.renderer = full_name; if( c.dataIndex == 'APP_CURRENT_USER') c.renderer = full_name;
} }
c.header = __('enterprise', _(c.header)); if (enableEnterprise) {
c.header = __('enterprise', _(c.header));
}
} }
//adding the hidden field DEL_INIT_DATE //adding the hidden field DEL_INIT_DATE