fernando/luos
1
0
Fork 0
Code Releases Activity

email_event

Browse Source
This commit is contained in:
marcelo.cuiza
2015-06-25 16:41:28 -04:00
parent 5180199058
commit b1a62f2b9f
6 changed files with 5114 additions and 5129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -728,13 +728,8 @@ class Derivation
if ($canDerivate) { if ($canDerivate) {
//Throw Message-Events //Throw Message-Events
$case = new \ProcessMaker\BusinessModel\Cases(); $case = new \ProcessMaker\BusinessModel\Cases();
<<<<<<< HEAD
$case->throwMessageEventBetweenElementOriginAndElementDest( $case->throwMessageEventBetweenElementOriginAndElementDest($currentDelegation["TAS_UID"], $nextDel["TAS_UID"], $appFields);
$currentDelegation["TAS_UID"],
$nextDel["TAS_UID"],
$appFields
);
//Email Event //Email Event
$emailEvent = new \ProcessMaker\BusinessModel\EmailEvent(); $emailEvent = new \ProcessMaker\BusinessModel\EmailEvent();
@@ -745,13 +740,6 @@ class Derivation
$appFields $appFields
); );
//Derivation
$aSP = isset( $aSP ) ? $aSP : null;
$iNewDelIndex = $this->doDerivation( $currentDelegation, $nextDel, $appFields, $aSP );
=======
$case->throwMessageEventBetweenElementOriginAndElementDest($currentDelegation["TAS_UID"], $nextDel["TAS_UID"], $appFields);
//Derivate //Derivate
$aSP = isset( $aSP ) ? $aSP : null; $aSP = isset( $aSP ) ? $aSP : null;
@@ -769,7 +757,6 @@ class Derivation
$scriptTask = new \ProcessMaker\BusinessModel\ScriptTask(); $scriptTask = new \ProcessMaker\BusinessModel\ScriptTask();
$appFields = $scriptTask->execScriptByActivityUid($nextDel["TAS_UID"], $appFields); $appFields = $scriptTask->execScriptByActivityUid($nextDel["TAS_UID"], $appFields);
>>>>>>> master
//Create record in table APP_ASSIGN_SELF_SERVICE_VALUE //Create record in table APP_ASSIGN_SELF_SERVICE_VALUE
$task = new Task(); $task = new Task();
@@ -1303,4 +1290,3 @@ class Derivation
} }
} }
} }

3
workflow/engine/config/schema.xml
View File

@@ -1255,7 +1255,7 @@
<column name="TAS_SELFSERVICE_EXECUTION" type="VARCHAR" size="15" default="EVERY_TIME"/> <column name="TAS_SELFSERVICE_EXECUTION" type="VARCHAR" size="15" default="EVERY_TIME"/>
<validator column="TAS_TYPE"> <validator column="TAS_TYPE">
<rule name="validValues" value="NORMAL|ADHOC|SUBPROCESS|HIDDEN|GATEWAYTOGATEWAY|WEBENTRYEVENT|END-MESSAGE-EVENT|START-MESSAGE-EVENT|INTERMEDIATE-THROW-MESSAGE-EVENT|INTERMEDIATE-CATCH-MESSAGE-EVENT|SCRIPT-TASK|END-EMAIL-EVENT" message="Please enter a valid value for TAS_TYPE"/> <rule name="validValues" value="NORMAL|ADHOC|SUBPROCESS|HIDDEN|GATEWAYTOGATEWAY|WEBENTRYEVENT|END-MESSAGE-EVENT|START-MESSAGE-EVENT|INTERMEDIATE-THROW-MESSAGE-EVENT|INTERMEDIATE-CATCH-MESSAGE-EVENT|SCRIPT-TASK|END-EMAIL-EVENT|" message="Please enter a valid value for TAS_TYPE"/>
</validator> </validator>
<validator column="TAS_TIMEUNIT"> <validator column="TAS_TIMEUNIT">
<rule name="validValues" value="MINUTES|HOURS|DAYS|WEEKS|MONTHS" message="Please select a valid value for TAS_TIMEUNIT."/> <rule name="validValues" value="MINUTES|HOURS|DAYS|WEEKS|MONTHS" message="Please select a valid value for TAS_TIMEUNIT."/>
@@ -5100,5 +5100,4 @@
<column name="EMAIL_EVENT_SUBJECT" type="VARCHAR" size="150" required="false" default=""/> <column name="EMAIL_EVENT_SUBJECT" type="VARCHAR" size="150" required="false" default=""/>
<column name="PRF_UID" type="VARCHAR" size="32" required="false" default="" /> <column name="PRF_UID" type="VARCHAR" size="32" required="false" default="" />
</table> </table>
</database> </database>