diff --git a/workflow/engine/classes/class.pmDynaform.php b/workflow/engine/classes/class.pmDynaform.php index bf488d559..bb5282744 100644 --- a/workflow/engine/classes/class.pmDynaform.php +++ b/workflow/engine/classes/class.pmDynaform.php @@ -435,6 +435,7 @@ class pmDynaform $oCriteriaAppDocument->addSelectColumn(AppDocumentPeer::DOC_VERSION); $oCriteriaAppDocument->add(AppDocumentPeer::APP_UID, $this->fields["APP_DATA"]["APPLICATION"]); $oCriteriaAppDocument->add(AppDocumentPeer::APP_DOC_FIELDNAME, $json->name); + $oCriteriaAppDocument->add(AppDocumentPeer::APP_DOC_STATUS, 'ACTIVE'); $oCriteriaAppDocument->addDescendingOrderByColumn(AppDocumentPeer::APP_DOC_CREATE_DATE); $oCriteriaAppDocument->setLimit(1); $rs = AppDocumentPeer::doSelectRS($oCriteriaAppDocument); diff --git a/workflow/engine/methods/processes/processes_Export.php b/workflow/engine/methods/processes/processes_Export.php index 8b40e311e..039087510 100644 --- a/workflow/engine/methods/processes/processes_Export.php +++ b/workflow/engine/methods/processes/processes_Export.php @@ -30,7 +30,7 @@ try { $proUid = Bootstrap::json_decode( $_POST['data']); $_GET["pro_uid"] = $proUid->pro_uid; /*----------------------------------********---------------------------------*/ - $_GET["objects"] = $proUid->objects; + $_GET["objects"] = (property_exists($proUid, 'objects'))? $proUid->objects : ''; /*----------------------------------********---------------------------------*/ } if (\BpmnProject::exists($_GET["pro_uid"]) && isset($_GET['objects'])) { @@ -68,7 +68,7 @@ try { $G_PUBLISH = new Publisher(); $G_PUBLISH->AddContent( "xmlform", "xmlform", "processes/processes_Export", "", $result ); - + G::RenderPage( "publish", "raw" ); } else{ echo json_encode($response); @@ -162,4 +162,3 @@ try { // $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'login/showMessage', '', $aMessage ); // G::RenderPage( 'publish', 'raw' ); //} - diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Cases.php b/workflow/engine/src/ProcessMaker/BusinessModel/Cases.php index 8f790ec62..9a048dd15 100644 --- a/workflow/engine/src/ProcessMaker/BusinessModel/Cases.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/Cases.php @@ -2970,7 +2970,7 @@ class Cases //Current users of OPEN DEL_INDEX thread $aCurUser = $appDelegation->getCurrentUsers($val['APP_UID'], $val['DEL_INDEX']); if (!empty($aCurUser)) { - foreach ($aCurUser as $key => $value) { + foreach ($aCurUser as $keyAux => $value) { if ($value === $data['usr_uid_target']) { $flagReassign = false; $result = 1; @@ -2980,14 +2980,15 @@ class Cases //DEL_INDEX is CLOSED $dataResponse['cases'][$key]['result'] = 0; $dataResponse['cases'][$key]['status'] = \G::LoadTranslation('ID_REASSIGNMENT_ERROR'); + $flagReassign = false; } if ($flagReassign) { $reassigned = $oCases->reassignCase($val['APP_UID'], $val['DEL_INDEX'], $usrUid, $data['usr_uid_target']); $result = $reassigned ? 1 : 0; + $dataResponse['cases'][$key]['status'] = 'SUCCESS'; } $dataResponse['cases'][$key]['result'] = $result; - $dataResponse['cases'][$key]['status'] = 'SUCCESS'; } } unset($dataResponse['usr_uid_target']);