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

PM-2973: I solve some issues

Browse Source
This commit is contained in:
Paula V. Quispe
2015-06-19 17:24:16 -04:00
parent 7db09b642a
commit 39efbba12b
3 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
workflow/engine/classes/class.consolidatedCases.php
View File

@@ -19,9 +19,6 @@ class ConsolidatedCases
$oCaseConsolidated = new CaseConsolidatedCore(); $oCaseConsolidated = new CaseConsolidatedCore();
$oCaseConsolidated = CaseConsolidatedCorePeer::retrieveByPK($sTasUid); $oCaseConsolidated = CaseConsolidatedCorePeer::retrieveByPK($sTasUid);
if (!(is_object($oCaseConsolidated)) || get_class($oCaseConsolidated) != 'CaseConsolidatedCore') { if (!(is_object($oCaseConsolidated)) || get_class($oCaseConsolidated) != 'CaseConsolidatedCore') {
$oCaseConsolidated = new CaseConsolidatedCore();
$oCaseConsolidated->setTasUid($sTasUid);
$oCaseConsolidated->delete();
$oCaseConsolidated = new CaseConsolidatedCore(); $oCaseConsolidated = new CaseConsolidatedCore();
$oCaseConsolidated->setTasUid($sTasUid); $oCaseConsolidated->setTasUid($sTasUid);
$oCaseConsolidated->setConStatus('INACTIVE'); $oCaseConsolidated->setConStatus('INACTIVE');
@@ -172,16 +169,11 @@ class ConsolidatedCases
$sRepTabUid = $_POST['form']['REP_TAB_UID']; $sRepTabUid = $_POST['form']['REP_TAB_UID'];
$oCaseConsolidated = CaseConsolidatedCorePeer::retrieveByPK($sTasUid); $oCaseConsolidated = CaseConsolidatedCorePeer::retrieveByPK($sTasUid);
$oCaseConsolidated = new CaseConsolidatedCore();
$oCaseConsolidated->setTasUid($sTasUid);
$oCaseConsolidated->setTasUid($sTasUid);
if (!(is_object($oCaseConsolidated)) || get_class($oCaseConsolidated) != 'CaseConsolidatedCore') { if (!(is_object($oCaseConsolidated)) || get_class($oCaseConsolidated) != 'CaseConsolidatedCore') {
$oCaseConsolidated = new CaseConsolidatedCore(); $oCaseConsolidated = new CaseConsolidatedCore();
$oCaseConsolidated->setTasUid($sTasUid); $oCaseConsolidated->setTasUid($sTasUid);
} }
$oCaseConsolidated = new CaseConsolidatedCore();
$oCaseConsolidated->setTasUid($sTasUid);
$oCaseConsolidated->setConStatus('ACTIVE'); $oCaseConsolidated->setConStatus('ACTIVE');
$oCaseConsolidated->setDynUid($sDynUid); $oCaseConsolidated->setDynUid($sDynUid);
$oCaseConsolidated->setRepTabUid($sRepTabUid); $oCaseConsolidated->setRepTabUid($sRepTabUid);

3
workflow/engine/src/ProcessMaker/BusinessModel/Consolidated.php
View File

@@ -65,6 +65,8 @@ class Consolidated
* @param string $app_number, Task Uid * @param string $app_number, Task Uid
* @param string $del_index, Task Uid * @param string $del_index, Task Uid
* @param string $usr_uid, Task Uid * @param string $usr_uid, Task Uid
* @param string $fieldName, Field Name
* @param string $fieldValue, Field Value
* @return string * @return string
* *
* @author Brayan Pereyra (Cochalo) <brayan@colosa.com> * @author Brayan Pereyra (Cochalo) <brayan@colosa.com>
@@ -75,7 +77,6 @@ class Consolidated
G::LoadClass("library"); G::LoadClass("library");
G::LoadClass("wsBase"); G::LoadClass("wsBase");
G::LoadClass("case"); G::LoadClass("case");
$ws = new \wsBase(); $ws = new \wsBase();
$oCase = new \Cases(); $oCase = new \Cases();

2
workflow/engine/templates/cases/casesListConsolidated.js
View File

@@ -1341,7 +1341,7 @@ function ajaxDerivationRequest(appUid, delIndex, maxLenght, appNumber,fieldGridG
window.location.reload(); window.location.reload();
} }
if (fullResponseText.charAt(0) != "<") { if (fullResponseText.charAt(0) != "<" && parent.document.getElementById("batchRoutingCasesNumRec") != null) {
parent.document.getElementById("batchRoutingCasesNumRec").innerHTML = parseInt(dataResponse.casesNumRec); parent.document.getElementById("batchRoutingCasesNumRec").innerHTML = parseInt(dataResponse.casesNumRec);
} }