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

Merged in paulis/processmaker/HOR-2314 (pull request #5221)

Browse Source 
HOR-2314
This commit is contained in:
Paula Quispe
2016-11-30 20:34:41 +00:00
parent fec61305b2 f9ca2534db
commit ed5d7a933d
3 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
workflow/engine/classes/model/map/TaskMapBuilder.php
View File

@@ -181,7 +181,7 @@ class TaskMapBuilder
$tMap->addColumn('TAS_AUTO_ROOT', 'TasAutoRoot', 'string', CreoleTypes::VARCHAR, true, 20);
$tMap->addColumn('TAS_RECEIVE_SERVER_UID', 'TasReceiveServerUid', 'string', CreoleTypes::VARCHAR, true, 32);
$tMap->addColumn('TAS_RECEIVE_SERVER_UID', 'TasReceiveServerUid', 'string', CreoleTypes::VARCHAR, false, 32);
$tMap->addColumn('TAS_RECEIVE_LAST_EMAIL', 'TasReceiveLastEmail', 'string', CreoleTypes::VARCHAR, true, 20);

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

@@ -1321,7 +1321,7 @@
<column name="TAS_OFFLINE" type="VARCHAR" size="20" required="true" default="FALSE"/>
<column name="TAS_EMAIL_SERVER_UID" type="VARCHAR" size="32" required="false" default=""/>
<column name="TAS_AUTO_ROOT" type="VARCHAR" size="20" required="true" default="FALSE"/>
<column name="TAS_RECEIVE_SERVER_UID" type="VARCHAR" size="32" required="true" default=""/>
<column name="TAS_RECEIVE_SERVER_UID" type="VARCHAR" size="32" required="false" default=""/>
<column name="TAS_RECEIVE_LAST_EMAIL" type="VARCHAR" size="20" required="true" default="FALSE"/>
<column name="TAS_RECEIVE_EMAIL_FROM_FORMAT" type="INTEGER" default="0"/>
<column name="TAS_RECEIVE_MESSAGE_TYPE" type="VARCHAR" size="20" required="true" default="text"/>

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

@@ -437,9 +437,7 @@ class Task
}
if ($arrayProperty["TAS_RECEIVE_LAST_EMAIL"] == "TRUE") {
if (empty($arrayProperty["TAS_RECEIVE_SERVER_UID"])) {
throw (new \Exception("Invalid value specified for 'tas_receive_server_uid'"));
}
if (empty($arrayProperty["TAS_RECEIVE_SUBJECT_MESSAGE"])) {
throw (new \Exception("Invalid value specified for 'tas_receive_subject_message'"));
}