fernando/luos
1
0
Fork 0
Code Releases Activity

Merge remote-tracking branch 'upstream/3.0.1.7' into 3.0.1.7-Gmail

Browse Source
This commit is contained in:
Dante
2015-12-09 09:38:40 -04:00
parent 1c15339798 8ac05c8f53
commit 7297f20dd9
41 changed files with 378 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
workflow/engine/src/ProcessMaker/BusinessModel/EmailEvent.php
View File

@@ -69,8 +69,10 @@ class EmailEvent
$aRow['EMAIL'] = $aRow['MESS_ACCOUNT'];
} else {
$aRow['EMAIL'] = $aRow['MESS_FROM_MAIL'];
}
if($aRow['EMAIL'] != "") {
$accountsArray[] = array_change_key_case($aRow, CASE_LOWER);
}
$accountsArray[] = array_change_key_case($aRow, CASE_LOWER);
}
$result->next();
}

1
workflow/engine/src/ProcessMaker/BusinessModel/Light.php
View File

@@ -490,6 +490,7 @@ class Light
case '': //when this task is the Finish process
case 'nobody':
$userFields = $oDerivation->getUsersFullNameFromArray( $derive[$sKey]['USER_UID'] );
$taskAss = array();
$taskAss['routeFinishFlag'] = true;
$user['userId'] = $derive[$sKey]['USER_UID'];
$user['userFullName'] = $userFields['USR_FULLNAME'];

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

@@ -880,6 +880,9 @@ class Variable
$criteria->addSelectColumn(\ProcessVariablesPeer::VAR_UID);
$criteria->addSelectColumn(\ProcessVariablesPeer::VAR_NAME);
$criteria->addSelectColumn(\ProcessVariablesPeer::VAR_FIELD_TYPE);
$criteria->addSelectColumn(\ProcessVariablesPeer::VAR_DBCONNECTION);
$criteria->addSelectColumn(\ProcessVariablesPeer::VAR_SQL);
$criteria->addSelectColumn(\ProcessVariablesPeer::VAR_ACCEPTED_VALUES);
$criteria->add(\ProcessVariablesPeer::VAR_NAME, $variableName);
$criteria->add(\ProcessVariablesPeer::PRJ_UID, $processUid);
$rsCriteria = \ProcessVariablesPeer::doSelectRS($criteria);

7
workflow/engine/src/ProcessMaker/Project/Bpmn.php
View File

@@ -660,8 +660,9 @@ class Bpmn extends Handler
$arrayEventType = array("START", "END", "INTERMEDIATE");
$arrayAux = array(
array("eventUid" => $bpmnFlow["FLO_ELEMENT_ORIGIN"], "eventMarker" => "MESSAGETHROW"),
array("eventUid" => $bpmnFlow["FLO_ELEMENT_DEST"], "eventMarker" => "MESSAGECATCH")
array("eventUid" => $bpmnFlow["FLO_ELEMENT_ORIGIN"], "eventMarker" => array("MESSAGETHROW",
"EMAIL")),
array("eventUid" => $bpmnFlow["FLO_ELEMENT_DEST"], "eventMarker" => array("MESSAGECATCH"))
);
foreach ($arrayAux as $value) {
@@ -670,7 +671,7 @@ class Bpmn extends Handler
$criteria->addSelectColumn(\BpmnEventPeer::EVN_UID);
$criteria->add(\BpmnEventPeer::EVN_UID, $value["eventUid"], \Criteria::EQUAL);
$criteria->add(\BpmnEventPeer::EVN_TYPE, $arrayEventType, \Criteria::IN);
$criteria->add(\BpmnEventPeer::EVN_MARKER, $value["eventMarker"], \Criteria::EQUAL);
$criteria->add(\BpmnEventPeer::EVN_MARKER, $value["eventMarker"], \Criteria::IN);
$rsCriteria = \BpmnEventPeer::doSelectRS($criteria);