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

Merged in bugfix/PMC-1428 (pull request #7154)

Browse Source 
PMC-1428

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
This commit is contained in:
Paula Quispe
2019-11-27 20:23:21 +00:00
committed by Julio Cesar Laura Avendaño
parent 3f99c9ef45 3b1deb5e10
commit 43fb643b0d
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
workflow/engine/src/ProcessMaker/BusinessModel/Cases.php
View File

@@ -1733,7 +1733,7 @@ class Cases
* @return array * @return array
* @throws Exception * @throws Exception
*/ */
private function __getFieldsAndValuesByDynaFormAndAppData(array $form, array $appData, array $caseVariable) private function getFieldsAndValuesByDynaFormAndAppData(array $form, array $appData, array $caseVariable)
{ {
try { try {
foreach ($form['items'] as $value) { foreach ($form['items'] as $value) {
@@ -1754,7 +1754,7 @@ class Cases
} }
} }
} else { } else {
$caseVariableAux = $this->__getFieldsAndValuesByDynaFormAndAppData($field, $appData, $caseVariableAux = $this->getFieldsAndValuesByDynaFormAndAppData($field, $appData,
$caseVariable); $caseVariable);
$caseVariable = array_merge($caseVariable, $caseVariableAux); $caseVariable = array_merge($caseVariable, $caseVariableAux);
} }
@@ -1827,7 +1827,7 @@ class Cases
$arrayAppData = $fields['APP_DATA']; $arrayAppData = $fields['APP_DATA'];
$arrayCaseVariable = $this->__getFieldsAndValuesByDynaFormAndAppData( $arrayCaseVariable = $this->getFieldsAndValuesByDynaFormAndAppData(
$arrayDynContent['items'][0], $arrayAppData, $arrayCaseVariable $arrayDynContent['items'][0], $arrayAppData, $arrayCaseVariable
); );
} else { } else {
@@ -2406,7 +2406,7 @@ class Cases
* @return array * @return array
* @throws Exception * @throws Exception
*/ */
private function __getStatusInfoDataByRsCriteria($rsCriteria) private function getStatusInfoDataByRsCriteria($rsCriteria)
{ {
try { try {
$arrayData = []; $arrayData = [];
@@ -2489,7 +2489,7 @@ class Cases
$rsCriteria = AppDelayPeer::doSelectRS($criteria); $rsCriteria = AppDelayPeer::doSelectRS($criteria);
$rsCriteria->setFetchmode(ResultSet::FETCHMODE_ASSOC); $rsCriteria->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$arrayData = $this->__getStatusInfoDataByRsCriteria($rsCriteria); $arrayData = $this->getStatusInfoDataByRsCriteria($rsCriteria);
if (!empty($arrayData)) { if (!empty($arrayData)) {
return $arrayData; return $arrayData;
@@ -2522,7 +2522,7 @@ class Cases
$rsCriteria = AppCacheViewPeer::doSelectRS($criteria); $rsCriteria = AppCacheViewPeer::doSelectRS($criteria);
$rsCriteria->setFetchmode(ResultSet::FETCHMODE_ASSOC); $rsCriteria->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$arrayData = $this->__getStatusInfoDataByRsCriteria($rsCriteria); $arrayData = $this->getStatusInfoDataByRsCriteria($rsCriteria);
if (!empty($arrayData)) { if (!empty($arrayData)) {
return $arrayData; return $arrayData;
@@ -2565,7 +2565,7 @@ class Cases
$rsCriteria = ApplicationPeer::doSelectRS($criteria); $rsCriteria = ApplicationPeer::doSelectRS($criteria);
$rsCriteria->setFetchmode(ResultSet::FETCHMODE_ASSOC); $rsCriteria->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$arrayData = $this->__getStatusInfoDataByRsCriteria($rsCriteria); $arrayData = $this->getStatusInfoDataByRsCriteria($rsCriteria);
if (!empty($arrayData)) { if (!empty($arrayData)) {
return $arrayData; return $arrayData;
@@ -2605,7 +2605,7 @@ class Cases
$rsCriteria2 = ApplicationPeer::doSelectRS($criteria2); $rsCriteria2 = ApplicationPeer::doSelectRS($criteria2);
$rsCriteria2->setFetchmode(ResultSet::FETCHMODE_ASSOC); $rsCriteria2->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$arrayData = $this->__getStatusInfoDataByRsCriteria($rsCriteria2); $arrayData = $this->getStatusInfoDataByRsCriteria($rsCriteria2);
if (!empty($arrayData)) { if (!empty($arrayData)) {
return $arrayData; return $arrayData;
@@ -3152,7 +3152,7 @@ class Cases
* *
* @return array Returns array with Case data updated * @return array Returns array with Case data updated
*/ */
private function __applicationDataDeleteMultipleFile( private function applicationDataDeleteMultipleFile(
array $arrayApplicationData, array $arrayApplicationData,
$variable1, $variable1,
$variable2, $variable2,
@@ -3198,7 +3198,7 @@ class Cases
case 'GRID': case 'GRID':
foreach ($arrayApplicationData[$variable1] as $key => $value) { foreach ($arrayApplicationData[$variable1] as $key => $value) {
if (array_key_exists($variable2, $value)) { if (array_key_exists($variable2, $value)) {
$arrayApplicationData[$variable1][$key] = $this->__applicationDataDeleteMultipleFile( $arrayApplicationData[$variable1][$key] = $this->applicationDataDeleteMultipleFile(
$value, $variable2, null, 'NORMAL', $arrayDocumentToDelete $value, $variable2, null, 'NORMAL', $arrayDocumentToDelete
); );
} }
@@ -3254,7 +3254,7 @@ class Cases
foreach ($arrayDocumentDelete as $value2) { foreach ($arrayDocumentDelete as $value2) {
$appDocument->remove($value2['appDocUid'], (int)($value2['version'])); $appDocument->remove($value2['appDocUid'], (int)($value2['version']));
$arrayApplicationData['APP_DATA'] = $this->__applicationDataDeleteMultipleFile( $arrayApplicationData['APP_DATA'] = $this->applicationDataDeleteMultipleFile(
$arrayApplicationData['APP_DATA'], $variable, null, $type, $value2 $arrayApplicationData['APP_DATA'], $variable, null, $type, $value2
); );
@@ -3272,7 +3272,7 @@ class Cases
foreach ($arrayDocumentDelete as $value4) { foreach ($arrayDocumentDelete as $value4) {
$appDocument->remove($value4['appDocUid'], (int)($value4['version'])); $appDocument->remove($value4['appDocUid'], (int)($value4['version']));
$arrayApplicationData['APP_DATA'] = $this->__applicationDataDeleteMultipleFile( $arrayApplicationData['APP_DATA'] = $this->applicationDataDeleteMultipleFile(
$arrayApplicationData['APP_DATA'], $grid, $variable, $type, $value4 $arrayApplicationData['APP_DATA'], $grid, $variable, $type, $value4
); );