fernando/luos
1
0
Fork 0
Code Releases Activity

Merge branch 'dashboards2' of bitbucket.org:colosa/processmaker into dashboards2

Browse Source
This commit is contained in:
Dante
2015-04-22 13:31:18 -04:00
parent 9e6150a2c4 71c18bd6e7
commit 32b9b938f3
22 changed files with 360 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
workflow/engine/src/ProcessMaker/BusinessModel/MessageEventDefinition.php
View File

@@ -293,16 +293,16 @@ class MessageEventDefinition
$messageEventDefinitionUid = \ProcessMaker\Util\Common::generateUID();
if (isset($arrayData["MSGED_VARIABLES"])) {
$arrayData["MSGED_VARIABLES"] = serialize($arrayData["MSGED_VARIABLES"]);
}
$messageEventDefinition->fromArray($arrayData, \BasePeer::TYPE_FIELDNAME);
$messageEventDefinition->setMsgedUid($messageEventDefinitionUid);
$messageEventDefinition->setPrjUid($projectUid);
$messageEventDefinition->setMsgedUsrUid("00000000000000000000000000000001"); //admin
if (isset($arrayData["MSGED_VARIABLES"])) {
$messageEventDefinition->setMsgedVariables(serialize($arrayData["MSGED_VARIABLES"]));
}
if ($messageEventDefinition->validate()) {
$cnn->begin();
@@ -375,7 +375,7 @@ class MessageEventDefinition
}
if (isset($arrayData["MSGED_VARIABLES"])) {
$messageEventDefinition->setMsgedVariables(serialize($arrayData["MSGED_VARIABLES"]));
$arrayData["MSGED_VARIABLES"] = serialize($arrayData["MSGED_VARIABLES"]);
}
$messageEventDefinition->fromArray($arrayData, \BasePeer::TYPE_FIELDNAME);
@@ -632,4 +632,3 @@ class MessageEventDefinition
}
}
}