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

Merge pull request #13 from brayanpereyra/BUG-8819

Browse Source 
BUG 8819 Remove the config to load the list  SOLVED
This commit is contained in:
julceslauhub
2012-05-29 13:57:43 -07:00
parent ddda4ef08b 0a2ecfc7f0
commit 485d14d03e
1 changed files with 35 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,7 +31,7 @@
$confReassignList = getReassignList(); $confReassignList = getReassignList();
// evaluates an action and the configuration for the list that will be rendered // evaluates an action and the configuration for the list that will be rendered
$config = getAdditionalFields($action, $confCasesList); $config = getAdditionalFields($action);
$columns = $config['caseColumns']; $columns = $config['caseColumns'];
$readerFields = $config['caseReaderFields']; $readerFields = $config['caseReaderFields'];
$reassignColumns = $confReassignList['caseColumns']; $reassignColumns = $confReassignList['caseColumns'];
@@ -738,55 +738,42 @@
* @param String $action * @param String $action
* @return Array $config * @return Array $config
*/ */
function getAdditionalFields($action, $confCasesList){
$caseColumns = array();
$caseReaderFields = array();
if ( !empty($confCasesList) && !empty($confCasesList['second']['data']) ) { function getAdditionalFields($action){
foreach($confCasesList['second']['data'] as $fieldData){ switch ( $action ) {
if ( $fieldData['fieldType']!='key' ) { case 'draft' :
$label = $fieldData['label']; $config = getDraft();
$caseColumns[] = array( 'header' => $label, 'dataIndex' => $fieldData['name'], 'width' => $fieldData['width'], 'align' => $fieldData['align'] );
$caseReaderFields[] = array( 'name' => $fieldData['name'] );
}
}
return array ( 'caseColumns' => $caseColumns, 'caseReaderFields' => $caseReaderFields, 'rowsperpage' => $confCasesList['rowsperpage'], 'dateformat' => $confCasesList['dateformat'] );
}
else { //seems this is only in case this user dont have the configuration for this action.
switch ( $action ) {
case 'draft' :
$config = getDraft();
break;
case 'simple_search':
case 'search' :
$config = getSearch();
break;
case 'participated' :
case 'sent' :
$config = getParticipated();
break;
case 'unassigned' :
$config = getUnassigned();
break;
case 'paused' :
$config = getPaused();
break;
case 'to_revise' :
$config = getToRevise();
break;
case 'to_reassign' :
$config = getToReassign();
break;
case 'gral' :
$config = getGeneral();
break;
case 'todo' :
default :
$action = 'todo';
$config = getToDo();
break; break;
} case 'simple_search':
return $config; case 'search' :
$config = getSearch();
break;
case 'participated' :
case 'sent' :
$config = getParticipated();
break;
case 'unassigned' :
$config = getUnassigned();
break;
case 'paused' :
$config = getPaused();
break;
case 'to_revise' :
$config = getToRevise();
break;
case 'to_reassign' :
$config = getToReassign();
break;
case 'gral' :
$config = getGeneral();
break;
case 'todo' :
default :
$action = 'todo';
$config = getToDo();
break;
} }
return $config;
} }