From 39efbba12bd5af1366642fa17e4ac212705f1ede Mon Sep 17 00:00:00 2001 From: "Paula V. Quispe" Date: Fri, 19 Jun 2015 17:24:16 -0400 Subject: [PATCH] PM-2973: I solve some issues --- workflow/engine/classes/class.consolidatedCases.php | 8 -------- .../src/ProcessMaker/BusinessModel/Consolidated.php | 3 ++- workflow/engine/templates/cases/casesListConsolidated.js | 2 +- 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/workflow/engine/classes/class.consolidatedCases.php b/workflow/engine/classes/class.consolidatedCases.php index e92c27903..c74ce4699 100644 --- a/workflow/engine/classes/class.consolidatedCases.php +++ b/workflow/engine/classes/class.consolidatedCases.php @@ -19,9 +19,6 @@ class ConsolidatedCases $oCaseConsolidated = new CaseConsolidatedCore(); $oCaseConsolidated = CaseConsolidatedCorePeer::retrieveByPK($sTasUid); if (!(is_object($oCaseConsolidated)) || get_class($oCaseConsolidated) != 'CaseConsolidatedCore') { - $oCaseConsolidated = new CaseConsolidatedCore(); - $oCaseConsolidated->setTasUid($sTasUid); - $oCaseConsolidated->delete(); $oCaseConsolidated = new CaseConsolidatedCore(); $oCaseConsolidated->setTasUid($sTasUid); $oCaseConsolidated->setConStatus('INACTIVE'); @@ -172,16 +169,11 @@ class ConsolidatedCases $sRepTabUid = $_POST['form']['REP_TAB_UID']; $oCaseConsolidated = CaseConsolidatedCorePeer::retrieveByPK($sTasUid); - $oCaseConsolidated = new CaseConsolidatedCore(); - $oCaseConsolidated->setTasUid($sTasUid); - $oCaseConsolidated->setTasUid($sTasUid); if (!(is_object($oCaseConsolidated)) || get_class($oCaseConsolidated) != 'CaseConsolidatedCore') { $oCaseConsolidated = new CaseConsolidatedCore(); $oCaseConsolidated->setTasUid($sTasUid); } - $oCaseConsolidated = new CaseConsolidatedCore(); - $oCaseConsolidated->setTasUid($sTasUid); $oCaseConsolidated->setConStatus('ACTIVE'); $oCaseConsolidated->setDynUid($sDynUid); $oCaseConsolidated->setRepTabUid($sRepTabUid); diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Consolidated.php b/workflow/engine/src/ProcessMaker/BusinessModel/Consolidated.php index 2267fd5b9..e66eca758 100644 --- a/workflow/engine/src/ProcessMaker/BusinessModel/Consolidated.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/Consolidated.php @@ -65,6 +65,8 @@ class Consolidated * @param string $app_number, Task Uid * @param string $del_index, Task Uid * @param string $usr_uid, Task Uid + * @param string $fieldName, Field Name + * @param string $fieldValue, Field Value * @return string * * @author Brayan Pereyra (Cochalo) @@ -75,7 +77,6 @@ class Consolidated G::LoadClass("library"); G::LoadClass("wsBase"); G::LoadClass("case"); - $ws = new \wsBase(); $oCase = new \Cases(); diff --git a/workflow/engine/templates/cases/casesListConsolidated.js b/workflow/engine/templates/cases/casesListConsolidated.js index 3eb244e35..2f3283d12 100644 --- a/workflow/engine/templates/cases/casesListConsolidated.js +++ b/workflow/engine/templates/cases/casesListConsolidated.js @@ -1341,7 +1341,7 @@ function ajaxDerivationRequest(appUid, delIndex, maxLenght, appNumber,fieldGridG window.location.reload(); } - if (fullResponseText.charAt(0) != "<") { + if (fullResponseText.charAt(0) != "<" && parent.document.getElementById("batchRoutingCasesNumRec") != null) { parent.document.getElementById("batchRoutingCasesNumRec").innerHTML = parseInt(dataResponse.casesNumRec); }