From c08cb8087e2e56577028519a428b139e9ff1a5ad Mon Sep 17 00:00:00 2001 From: Marco Antonio Nina Date: Thu, 28 Mar 2013 10:45:26 -0400 Subject: [PATCH] BUG 9872 Reassign Multiple Case, submit and 'Processing...' IMPROVEMENT - Listing was modified by a new parameter. - was add validation. --- workflow/engine/classes/class.applications.php | 10 ++++++---- .../methods/cases/proxySaveReassignCasesList.php | 4 ++-- workflow/engine/templates/cases/casesList.js | 2 ++ 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/workflow/engine/classes/class.applications.php b/workflow/engine/classes/class.applications.php index d7cfba43b..684a6392f 100644 --- a/workflow/engine/classes/class.applications.php +++ b/workflow/engine/classes/class.applications.php @@ -482,10 +482,12 @@ class Applications $aRow["APP_TAS_TITLE"] = $aRow["APPCVCR_APP_TAS_TITLE"]; //Current user - $aRow["USR_UID"] = $aRow["USRCR_USR_UID"]; - $aRow["USR_FIRSTNAME"] = $aRow["USRCR_USR_FIRSTNAME"]; - $aRow["USR_LASTNAME"] = $aRow["USRCR_USR_LASTNAME"]; - $aRow["USR_USERNAME"] = $aRow["USRCR_USR_USERNAME"]; + if ($action != "to_reassign" ) { + $aRow["USR_UID"] = $aRow["USRCR_USR_UID"]; + $aRow["USR_FIRSTNAME"] = $aRow["USRCR_USR_FIRSTNAME"]; + $aRow["USR_LASTNAME"] = $aRow["USRCR_USR_LASTNAME"]; + $aRow["USR_USERNAME"] = $aRow["USRCR_USR_USERNAME"]; + } } //Unassigned user diff --git a/workflow/engine/methods/cases/proxySaveReassignCasesList.php b/workflow/engine/methods/cases/proxySaveReassignCasesList.php index 21761b75f..9b692c9b9 100755 --- a/workflow/engine/methods/cases/proxySaveReassignCasesList.php +++ b/workflow/engine/methods/cases/proxySaveReassignCasesList.php @@ -59,8 +59,8 @@ if (is_array( $aData )) { $rs->setFetchmode( ResultSet::FETCHMODE_ASSOC ); $rs->next(); $row = $rs->getRow(); - $aCase = $oCases->loadCaseInCurrentDelegation( $data->APP_UID ); - $oCases->reassignCase( $aCase['APP_UID'], $aCase['DEL_INDEX'], ($aCase['USR_UID'] != '' ? $aCase['USR_UID'] : $_SESSION['USER_LOGGED']), $data->APP_REASSIGN_USER_UID ); + //$aCase = $oCases->loadCaseInCurrentDelegation( $data->APP_UID ); + $oCases->reassignCase( $row['APP_UID'], $row['DEL_INDEX'], ($row['USR_UID'] != '' ? $row['USR_UID'] : $_SESSION['USER_LOGGED']), $data->APP_REASSIGN_USER_UID ); $currentCasesReassigned ++; $casesReassignedCount ++; $serverResponse[] = array ('APP_REASSIGN_USER' => $data->APP_REASSIGN_USER,'APP_TITLE' => $data->APP_TITLE,'TAS_TITLE' => $data->APP_TAS_TITLE,'REASSIGNED_CASES' => $currentCasesReassigned diff --git a/workflow/engine/templates/cases/casesList.js b/workflow/engine/templates/cases/casesList.js index 47af27fd5..15c3f43e0 100644 --- a/workflow/engine/templates/cases/casesList.js +++ b/workflow/engine/templates/cases/casesList.js @@ -22,6 +22,7 @@ var storeCases; var storeReassignCases; var grid; var textJump; +var ids = ''; Ext.Ajax.timeout = 4 * 60 * 1000; @@ -2127,6 +2128,7 @@ function reassign(){ ids += rows[i].get('APP_UID') + "|" + rows[i].get('TAS_UID')+ "|" + rows[i].get('DEL_INDEX'); } storeReassignCases.setBaseParam( 'APP_UIDS', ids); + //storeReassignCases.setBaseParam( 'action', 'to_reassign'); storeReassignCases.load(); newPopUp.show();