diff --git a/workflow/engine/methods/cases/proxySaveReassignCasesList.php b/workflow/engine/methods/cases/proxySaveReassignCasesList.php index 755de34a0..0b9878a77 100755 --- a/workflow/engine/methods/cases/proxySaveReassignCasesList.php +++ b/workflow/engine/methods/cases/proxySaveReassignCasesList.php @@ -60,9 +60,9 @@ $rs = AppCacheViewPeer::doSelectRS($oTmpReassignCriteria); $rs->setFetchmode(ResultSet::FETCHMODE_ASSOC); $rs->next(); - $row = $rs->getRow(); + $row = $rs->getRow(); $aCase = $oCases->loadCaseInCurrentDelegation($data->APP_UID); - $oCases->reassignCase($aCase['APP_UID'], $aCase['DEL_INDEX'], $aCase['USR_UID'], $data->APP_REASSIGN_USER_UID); + $oCases->reassignCase($aCase['APP_UID'], $aCase['DEL_INDEX'], ($aCase['USR_UID'] != '' ? $aCase['USR_UID'] : $_SESSION['USER_LOGGED']), $data->APP_REASSIGN_USER_UID); $currentCasesReassigned++; $casesReassignedCount++; $serverResponse[] = array ('APP_REASSIGN_USER' => $data->APP_REASSIGN_USER, @@ -70,7 +70,7 @@ 'TAS_TITLE' => $data->APP_TAS_TITLE, 'REASSIGNED_CASES' => $currentCasesReassigned); } - } + } else { $oTmpReassignCriteria = $oCasesReassignList; $oTmpReassignCriteria->add(AppCacheViewPeer::TAS_UID,$aData->TAS_UID); @@ -82,7 +82,7 @@ while (is_array($row)) { $APP_UID = $row['APP_UID']; $aCase = $oCases->loadCaseInCurrentDelegation($APP_UID); - $oCases->reassignCase($aCase['APP_UID'], $aCase['DEL_INDEX'], $aCase['USR_UID'], $aData->APP_REASSIGN_USER_UID); + $oCases->reassignCase($aCase['APP_UID'], $aCase['DEL_INDEX'], ($aCase['USR_UID'] != '' ? $aCase['USR_UID'] : $_SESSION['USER_LOGGED']), $aData->APP_REASSIGN_USER_UID); $currentCasesReassigned++; $casesReassignedCount++; // var_dump($aCase); diff --git a/workflow/engine/templates/cases/casesList.js b/workflow/engine/templates/cases/casesList.js index 3e1498b01..98c6efd84 100644 --- a/workflow/engine/templates/cases/casesList.js +++ b/workflow/engine/templates/cases/casesList.js @@ -668,8 +668,6 @@ Ext.onReady ( function() { var proxyReassignCasesList = new Ext.data.HttpProxy({ api: { read : 'proxyReassignCasesList' - //create : 'proxySaveReassignCasesList', - //update : 'proxySaveReassignCasesList', //destroy : 'proxyReassignCasesList' } }); @@ -793,7 +791,7 @@ Ext.onReady ( function() { ' {APP_PRO_TITLE}', '' ); - + Ext.Ajax.request({ url : 'casesList_Ajax' , params : {actionAjax : 'processListExtJs', @@ -905,12 +903,12 @@ Ext.onReady ( function() { listeners:{ scope: this, 'select': function() { - + filterCategory = comboCategory.value; storeCases.setBaseParam('category', filterCategory); storeCases.setBaseParam('process', ''); storeCases.load({params:{category: filterCategory, start : 0 , limit : pageSize}}); - + Ext.Ajax.request({ url : 'casesList_Ajax' , params : {actionAjax : 'processListExtJs', @@ -921,7 +919,7 @@ Ext.onReady ( function() { comboProcess.getStore().removeAll(); comboProcess.getStore().loadData( data ); comboProcess.setValue(''); - + }, failure: function ( result, request) { Ext.MessageBox.alert('Failed', result.responseText); @@ -1455,7 +1453,7 @@ Ext.onReady ( function() { width: 120, value: '' }); - + var optionCategory = (solrConf != true) ? [ _('ID_CATEGORY'), comboCategory, '-'] : [''] ; var toolbarTodo = [ @@ -1617,8 +1615,8 @@ Ext.onReady ( function() { ' ', ' ' ]; - - + + var toolbarSearch = [ ' ',