fernando/luos
1
0
Fork 0
Code Releases Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Gustavo Cruz
2015-03-09 15:47:33 -04:00
parent 280e1326e2 1f99c5a471
commit cb9c21b92e
53 changed files with 1530 additions and 578 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -240,10 +240,6 @@ class MessageEventDefinition
throw new \Exception(\G::LoadTranslation("ID_MESSAGE_EVENT_DEFINITION_VARIABLES_DO_NOT_MEET_DEFINITION"));
}
}
if (isset($arrayData["MSGED_USR_UID"])) {
$process->throwExceptionIfNotExistsUser($arrayData["MSGED_USR_UID"], $this->arrayFieldNameForException["messageEventDefinitionUserUid"]);
}
} catch (\Exception $e) {
throw $e;
}
@@ -295,27 +291,13 @@ class MessageEventDefinition
$arrayData["MSGED_VARIABLES"] = array();
}
if (isset($arrayData["MSGED_USR_UID"]) && $arrayData["MSGED_USR_UID"] != "") {
$criteria = new \Criteria("workflow");
$criteria->addSelectColumn(\UsersPeer::USR_UID);
$criteria->add(\UsersPeer::USR_UID, $arrayData["MSGED_USR_UID"], \Criteria::EQUAL);
//QUERY
$rsCriteria = \UsersPeer::doSelectRS($criteria);
$rsCriteria->setFetchmode(\ResultSet::FETCHMODE_ASSOC);
if (!$rsCriteria->next()) {
$arrayData["MSGED_USR_UID"] = "";
}
}
$messageEventDefinitionUid = \ProcessMaker\Util\Common::generateUID();
$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"]));
@@ -328,32 +310,6 @@ class MessageEventDefinition
$cnn->commit();
//Task - User
if (isset($arrayData["MSGED_USR_UID"]) && $arrayData["MSGED_USR_UID"] != "") {
$bpmnEvent = \BpmnEventPeer::retrieveByPK($arrayData["EVN_UID"]);
//Event - START-MESSAGE-EVENT
if (!is_null($bpmnEvent) && $bpmnEvent->getEvnType() == "START" && $bpmnEvent->getEvnMarker() == "MESSAGECATCH") {
//Message-Event-Task-Relation - Get Task
$messageEventTaskRelation = new \ProcessMaker\BusinessModel\MessageEventTaskRelation();
$arrayMessageEventTaskRelationData = $messageEventTaskRelation->getMessageEventTaskRelationWhere(
array(
\MessageEventTaskRelationPeer::PRJ_UID => $projectUid,
\MessageEventTaskRelationPeer::EVN_UID => $bpmnEvent->getEvnUid()
),
true
);
if (!is_null($arrayMessageEventTaskRelationData)) {
//Assign
$task = new \Tasks();
$result = $task->assignUser($arrayMessageEventTaskRelationData["TAS_UID"], $arrayData["MSGED_USR_UID"], 1);
}
}
}
//Return
return $this->getMessageEventDefinition($messageEventDefinitionUid);
} else {
@@ -431,48 +387,6 @@ class MessageEventDefinition
$cnn->commit();
//Task - User
if (isset($arrayData["MSGED_USR_UID"]) && $arrayData["MSGED_USR_UID"] != $arrayMessageEventDefinitionData["MSGED_USR_UID"]) {
$bpmnEvent = \BpmnEventPeer::retrieveByPK($arrayMessageEventDefinitionData["EVN_UID"]);
//Event - START-MESSAGE-EVENT
if (!is_null($bpmnEvent) && $bpmnEvent->getEvnType() == "START" && $bpmnEvent->getEvnMarker() == "MESSAGECATCH") {
//Message-Event-Task-Relation - Get Task
$messageEventTaskRelation = new \ProcessMaker\BusinessModel\MessageEventTaskRelation();
$arrayMessageEventTaskRelationData = $messageEventTaskRelation->getMessageEventTaskRelationWhere(
array(
\MessageEventTaskRelationPeer::PRJ_UID => $arrayMessageEventDefinitionData["PRJ_UID"],
\MessageEventTaskRelationPeer::EVN_UID => $bpmnEvent->getEvnUid()
),
true
);
if (!is_null($arrayMessageEventTaskRelationData)) {
//Unassign
$taskUser = new \TaskUser();
$criteria = new \Criteria("workflow");
$criteria->add(\TaskUserPeer::TAS_UID, $arrayMessageEventTaskRelationData["TAS_UID"]);
$rsCriteria = \TaskUserPeer::doSelectRS($criteria);
$rsCriteria->setFetchmode(\ResultSet::FETCHMODE_ASSOC);
while ($rsCriteria->next()) {
$row = $rsCriteria->getRow();
$result = $taskUser->remove($row["TAS_UID"], $row["USR_UID"], $row["TU_TYPE"], $row["TU_RELATION"]);
}
//Assign
$task = new \Tasks();
$result = $task->assignUser($arrayMessageEventTaskRelationData["TAS_UID"], $arrayData["MSGED_USR_UID"], 1);
}
}
}
//Return
$arrayData = $arrayDataBackup;

8
workflow/engine/src/ProcessMaker/BusinessModel/OutputDocument.php
View File

@@ -38,6 +38,7 @@ class OutputDocument
$oCriteria->addSelectColumn(\OutputDocumentPeer::OUT_DOC_PDF_SECURITY_OPEN_PASSWORD);
$oCriteria->addSelectColumn(\OutputDocumentPeer::OUT_DOC_PDF_SECURITY_OWNER_PASSWORD);
$oCriteria->addSelectColumn(\OutputDocumentPeer::OUT_DOC_PDF_SECURITY_PERMISSIONS);
$oCriteria->addSelectColumn(\OutputDocumentPeer::OUT_DOC_OPEN_TYPE);
$oCriteria->addAsColumn('OUT_DOC_TITLE', 'C1.CON_VALUE');
$oCriteria->addAsColumn('OUT_DOC_DESCRIPTION', 'C2.CON_VALUE');
$oCriteria->addAsColumn('OUT_DOC_FILENAME', 'C3.CON_VALUE');
@@ -101,7 +102,8 @@ class OutputDocument
'out_doc_pdf_security_enabled' => $aRow['OUT_DOC_PDF_SECURITY_ENABLED'],
'out_doc_pdf_security_open_password' => $aRow['OUT_DOC_PDF_SECURITY_OPEN_PASSWORD'],
'out_doc_pdf_security_owner_password' => $aRow['OUT_DOC_PDF_SECURITY_OWNER_PASSWORD'],
'out_doc_pdf_security_permissions' => $aRow['OUT_DOC_PDF_SECURITY_PERMISSIONS']);
'out_doc_pdf_security_permissions' => $aRow['OUT_DOC_PDF_SECURITY_PERMISSIONS'],
"out_doc_open_type" => $aRow["OUT_DOC_OPEN_TYPE"]);
}
$oDataset->next();
}
@@ -145,6 +147,7 @@ class OutputDocument
$oCriteria->addSelectColumn(\OutputDocumentPeer::OUT_DOC_PDF_SECURITY_OPEN_PASSWORD);
$oCriteria->addSelectColumn(\OutputDocumentPeer::OUT_DOC_PDF_SECURITY_OWNER_PASSWORD);
$oCriteria->addSelectColumn(\OutputDocumentPeer::OUT_DOC_PDF_SECURITY_PERMISSIONS);
$oCriteria->addSelectColumn(\OutputDocumentPeer::OUT_DOC_OPEN_TYPE);
$oCriteria->add(\OutputDocumentPeer::OUT_DOC_UID, $sOutputDocumentUID);
$oCriteria->addAsColumn('OUT_DOC_TITLE', 'C1.CON_VALUE');
$oCriteria->addAsColumn('OUT_DOC_DESCRIPTION', 'C2.CON_VALUE');
@@ -209,7 +212,8 @@ class OutputDocument
'out_doc_pdf_security_enabled' => $aRow['OUT_DOC_PDF_SECURITY_ENABLED'],
'out_doc_pdf_security_open_password' => $aRow['OUT_DOC_PDF_SECURITY_OPEN_PASSWORD'],
'out_doc_pdf_security_owner_password' => $aRow['OUT_DOC_PDF_SECURITY_OWNER_PASSWORD'],
'out_doc_pdf_security_permissions' => $aRow['OUT_DOC_PDF_SECURITY_PERMISSIONS']);
'out_doc_pdf_security_permissions' => $aRow['OUT_DOC_PDF_SECURITY_PERMISSIONS'],
"out_doc_open_type" => $aRow["OUT_DOC_OPEN_TYPE"]);
}
$oDataset->next();
}

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

@@ -487,9 +487,9 @@ class Variable
$row = $rsCriteria->getRow();
$variableDbConnectionUid = $row["VAR_DBCONNECTION"];
$variableSql = $row["VAR_SQL"];
$variableSql = strtoupper($row["VAR_SQL"]);
} else {
throw new \Exception(G::LoadTranslation("ID_PROCESS_VARIABLE_DOES_NOT_EXIST", array(strtolower("VAR_NAME"), $variableName)));
throw new \Exception(G::LoadTranslation("ID_PROCESS_VARIABLE_DOES_NOT_EXIST", array("VAR_NAME", $variableName)));
}
//Verify data

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

@@ -112,6 +112,8 @@ class BpmnWorkflow extends Project\Bpmn
$arrayData["PRO_STATUS"] = $data["PRJ_STATUS"];
}
$arrayData["PRO_UPDATE_DATE"] = date("Y-m-d H:i:s");
$this->wp->update($arrayData);
}
@@ -602,7 +604,8 @@ class BpmnWorkflow extends Project\Bpmn
if ($elementType == "bpmnEvent" &&
in_array($key, array("end-message-event", "start-message-event", "intermediate-catch-message-event"))
) {
if ($key == "intermediate-catch-message-event") {
if (in_array($key, array("start-message-event", "intermediate-catch-message-event"))) {
//Task - User
//Assign to admin
$task = new \Tasks();
@@ -1091,6 +1094,10 @@ class BpmnWorkflow extends Project\Bpmn
$diagram["participants"] = $bwp->getParticipants($configList);
$project["diagrams"][] = $diagram;
}
if (file_exists(PATH_DOCUMENT . $project["prj_uid"])) {
$project["prj_bpmn_file_upload"] = file_get_contents(PATH_DOCUMENT . $project["prj_uid"]);
unlink(PATH_DOCUMENT . $project["prj_uid"]);
}
return $project;
}
@@ -1659,6 +1666,8 @@ class BpmnWorkflow extends Project\Bpmn
* Diagram's Flows Handling
*/
$whiteList = array();
$defaultFlow = array();
$pos = 0;
foreach ($diagram["flows"] as $i => $flowData) {
$flowData = array_change_key_case($flowData, CASE_UPPER);
@@ -1686,6 +1695,12 @@ class BpmnWorkflow extends Project\Bpmn
$flowData["FLO_ELEMENT_DEST"] = $mappedUid;
}
}
//Save the default flow Uid's
if($flowData["FLO_TYPE"] == 'DEFAULT'){
$defaultFlow[$pos]['GAT_UID'] = $flowData["FLO_ELEMENT_ORIGIN"];
$defaultFlow[$pos]['GAT_DEFAULT_FLOW'] = $flowData["FLO_UID"];
$pos++;
}
//Update UIDs
foreach ($result as $value) {
@@ -1728,6 +1743,17 @@ class BpmnWorkflow extends Project\Bpmn
}
$bwp->mapBpmnFlowsToWorkflowRoutes();
//Update the Default gateway
$gateways = $bwp->getGateways();
foreach ($gateways as $gatewayData) {
foreach ($defaultFlow as $def) {
if($gatewayData["GAT_UID"] == $def["GAT_UID"]){
$gatewayData["GAT_DEFAULT_FLOW"] = $def["GAT_DEFAULT_FLOW"];
$bwp->updateGateway($gatewayData["GAT_UID"], $gatewayData);
}
}
}
return $result;
}

5
workflow/engine/src/ProcessMaker/Services/Api/Project/OutputDocuments.php
View File

@@ -222,5 +222,10 @@ class OutputDocumentStructure
* @var string {@from body} {@min 0} {@max 150}
*/
public $out_doc_pdf_security_permissions;
/**
* @var int {@from body} {@choice 0,1}
*/
public $out_doc_open_type;
}