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

Merged in paulis/processmaker/PM-4123 (pull request #3193)

Browse Source 
PM-4123
This commit is contained in:
Julio Cesar Laura Avendaño
2015-11-20 21:12:25 -04:00
parent 13ba4cf8ec ca05c09136
commit ed95314f9f
3 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
workflow/engine/classes/class.derivation.php
View File

@@ -605,6 +605,9 @@ class Derivation
break; break;
case "MULTIPLE_INSTANCE": case "MULTIPLE_INSTANCE":
$userFields = $this->getUsersFullNameFromArray($this->getAllUsersFromAnyTask($nextAssignedTask["TAS_UID"])); $userFields = $this->getUsersFullNameFromArray($this->getAllUsersFromAnyTask($nextAssignedTask["TAS_UID"]));
if(empty($userFields)){
throw (new Exception( G::LoadTranslation( 'ID_NO_USERS' ) ));
}
break; break;
case "MULTIPLE_INSTANCE_VALUE_BASED": case "MULTIPLE_INSTANCE_VALUE_BASED":
$arrayApplicationData = $this->case->loadCase($tasInfo["APP_UID"]); $arrayApplicationData = $this->case->loadCase($tasInfo["APP_UID"]);

1
workflow/engine/classes/model/Task.php
View File

@@ -804,6 +804,7 @@ class Task extends BaseTask
$oCriteria = new Criteria(); $oCriteria = new Criteria();
$oCriteria->add(AppDelegationPeer::DEL_THREAD_STATUS, "OPEN"); $oCriteria->add(AppDelegationPeer::DEL_THREAD_STATUS, "OPEN");
$oCriteria->add(AppDelegationPeer::TAS_UID, $newValues['TAS_UID']); $oCriteria->add(AppDelegationPeer::TAS_UID, $newValues['TAS_UID']);
$oCriteria->add(AppDelegationPeer::USR_UID, "");
$oApplication = AppDelegationPeer::doSelectOne($oCriteria); $oApplication = AppDelegationPeer::doSelectOne($oCriteria);
if(!empty($oApplication)) { if(!empty($oApplication)) {
throw (new Exception(G::LoadTranslation('ID_CURRENT_ASSING_TYPE_WITH_CASES'))); throw (new Exception(G::LoadTranslation('ID_CURRENT_ASSING_TYPE_WITH_CASES')));

2
workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php
View File

@@ -255,7 +255,7 @@ class BpmnWorkflow extends Project\Bpmn
if($activityCurrent->getActLoopType() == "PARALLEL"){ if($activityCurrent->getActLoopType() == "PARALLEL"){
$task = \TaskPeer::retrieveByPK($actUid); $task = \TaskPeer::retrieveByPK($actUid);
if($task->getTasAssignType() == "BALANCED"){ if($task->getTasAssignType() == "BALANCED" || $task->getTasAssignType() == "MANUAL" || $task->getTasAssignType() == "EVALUATE" || $task->getTasAssignType() == "REPORT_TO" || $task->getTasAssignType() == "SELF_SERVICE"){
$taskData["TAS_ASSIGN_TYPE"] = "MULTIPLE_INSTANCE"; $taskData["TAS_ASSIGN_TYPE"] = "MULTIPLE_INSTANCE";
} }
} }