From 4ece7a7ed6b0c564298bce0b560d3c26d62fcbe1 Mon Sep 17 00:00:00 2001 From: Freddy Daniel Rojas Valda Date: Fri, 6 Feb 2015 12:15:05 -0400 Subject: [PATCH 1/3] "Fix. create pools, lanes and activities containers" --- .../ProcessMaker/Project/Adapter/BpmnWorkflow.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php b/workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php index c93d6bbb9..d599c46bb 100755 --- a/workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php +++ b/workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php @@ -899,7 +899,7 @@ class BpmnWorkflow extends Project\Bpmn //Activity //Update UIDs - if ($activityData["BOU_CONTAINER"] == "bpmnPool" || $activityData["BOU_CONTAINER"] == "bpmnLane") { + if ($activityData["BOU_CONTAINER"] == "bpmnPool" || $activityData["BOU_CONTAINER"] == "bpmnLane" || $activityData["BOU_CONTAINER"] == "bpmnActivity") { foreach ($result as $value) { if ($activityData["BOU_ELEMENT"] == $value["old_uid"]) { $activityData["BOU_ELEMENT"] = $value["new_uid"]; @@ -953,7 +953,7 @@ class BpmnWorkflow extends Project\Bpmn //Artifact //Update UIDs - if ($artifactData["BOU_CONTAINER"] == "bpmnPool" || $artifactData["BOU_CONTAINER"] == "bpmnLane") { + if ($artifactData["BOU_CONTAINER"] == "bpmnPool" || $artifactData["BOU_CONTAINER"] == "bpmnLane" || $artifactData["BOU_CONTAINER"] == "bpmnActivity") { foreach ($result as $value) { if ($artifactData["BOU_ELEMENT"] == $value["old_uid"]) { $artifactData["BOU_ELEMENT"] = $value["new_uid"]; @@ -1013,7 +1013,7 @@ class BpmnWorkflow extends Project\Bpmn //Gateway //Update UIDs - if ($gatewayData["BOU_CONTAINER"] == "bpmnPool" || $gatewayData["BOU_CONTAINER"] == "bpmnLane") { + if ($gatewayData["BOU_CONTAINER"] == "bpmnPool" || $gatewayData["BOU_CONTAINER"] == "bpmnLane" || $gatewayData["BOU_CONTAINER"] == "bpmnActivity") { foreach ($result as $value) { if ($gatewayData["BOU_ELEMENT"] == $value["old_uid"]) { $gatewayData["BOU_ELEMENT"] = $value["new_uid"]; @@ -1087,7 +1087,7 @@ class BpmnWorkflow extends Project\Bpmn //Event //Update UIDs - if ($eventData["BOU_CONTAINER"] == "bpmnPool" || $eventData["BOU_CONTAINER"] == "bpmnLane") { + if ($eventData["BOU_CONTAINER"] == "bpmnPool" || $eventData["BOU_CONTAINER"] == "bpmnLane" || $eventData["BOU_CONTAINER"] == "bpmnActivity") { foreach ($result as $value) { if ($eventData["BOU_ELEMENT"] == $value["old_uid"]) { $eventData["BOU_ELEMENT"] = $value["new_uid"]; @@ -1143,7 +1143,7 @@ class BpmnWorkflow extends Project\Bpmn //Data //Update UIDs - if ($dataObjectData["BOU_CONTAINER"] == "bpmnPool" || $dataObjectData["BOU_CONTAINER"] == "bpmnLane") { + if ($dataObjectData["BOU_CONTAINER"] == "bpmnPool" || $dataObjectData["BOU_CONTAINER"] == "bpmnLane" || $dataObjectData["BOU_CONTAINER"] == "bpmnActivity") { foreach ($result as $value) { if ($dataObjectData["BOU_ELEMENT"] == $value["old_uid"]) { $dataObjectData["BOU_ELEMENT"] = $value["new_uid"]; @@ -1200,7 +1200,7 @@ class BpmnWorkflow extends Project\Bpmn //Participant //Update UIDs - if ($participantData["BOU_CONTAINER"] == "bpmnPool" || $participantData["BOU_CONTAINER"] == "bpmnLane") { + if ($participantData["BOU_CONTAINER"] == "bpmnPool" || $participantData["BOU_CONTAINER"] == "bpmnLane" || $participantData["BOU_CONTAINER"] == "bpmnActivity") { foreach ($result as $value) { if ($participantData["BOU_ELEMENT"] == $value["old_uid"]) { $participantData["BOU_ELEMENT"] = $value["new_uid"]; From 6abb701bae45dc104c91ce09bfc379cc7d582cbc Mon Sep 17 00:00:00 2001 From: Luis Fernando Saisa Lopez Date: Fri, 6 Feb 2015 13:20:39 -0400 Subject: [PATCH 2/3] =?UTF-8?q?PM=20940=20"BPMN=20Designer=20A=C3=B1r=20li?= =?UTF-8?q?sta=20de=20messages"=20SOLVED?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit > Se agregado el Frontend para el modulo Message Type. --- .../BusinessModel/MessageType.php | 2 +- workflow/engine/templates/designer/index.html | 26 +++++++++++-------- 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/MessageType.php b/workflow/engine/src/ProcessMaker/BusinessModel/MessageType.php index 3cf2833d9..fb259171f 100644 --- a/workflow/engine/src/ProcessMaker/BusinessModel/MessageType.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/MessageType.php @@ -7,7 +7,7 @@ class MessageType "MSGT_UID" => array("type" => "string", "required" => false, "empty" => false, "defaultValues" => array(), "fieldNameAux" => "messageTypeUid"), "PRJ_UID" => array("type" => "string", "required" => false, "empty" => false, "defaultValues" => array(), "fieldNameAux" => "projectUid"), "MSGT_NAME" => array("type" => "string", "required" => true, "empty" => false, "defaultValues" => array(), "fieldNameAux" => "messageTypeName"), - "MSGT_VARIABLES" => array("type" => "array", "required" => false, "empty" => false, "defaultValues" => array(), "fieldNameAux" => "messageTypeVariables") + "MSGT_VARIABLES" => array("type" => "array", "required" => false, "empty" => true, "defaultValues" => array(), "fieldNameAux" => "messageTypeVariables") ); private $formatFieldNameInUppercase = true; diff --git a/workflow/engine/templates/designer/index.html b/workflow/engine/templates/designer/index.html index b38e943b2..8ee0f1d4a 100644 --- a/workflow/engine/templates/designer/index.html +++ b/workflow/engine/templates/designer/index.html @@ -91,13 +91,13 @@
    • - +
    - +
    @@ -113,19 +113,19 @@
    -
    +
    - - + +
    -
    - - - - +
    + + + +
    - +
      @@ -137,6 +137,10 @@ --> +
    • + + +
    • From 1c3fd23c77754815b8cf411e55308835f7eec472 Mon Sep 17 00:00:00 2001 From: Roly Rudy Gutierrez Pinto Date: Fri, 6 Feb 2015 14:08:46 -0400 Subject: [PATCH 3/3] IMPROVEMENT add pmDynaform grid data --- workflow/engine/classes/class.pmDynaform.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workflow/engine/classes/class.pmDynaform.php b/workflow/engine/classes/class.pmDynaform.php index 13c12e315..d45c6f9d1 100644 --- a/workflow/engine/classes/class.pmDynaform.php +++ b/workflow/engine/classes/class.pmDynaform.php @@ -119,7 +119,7 @@ class pmDynaform if (is_array($items[$key])) { $this->mergeAppData($app_uid, $items[$key]); } else { - if (isset($items[$key]->var_name) && isset($this->data[$items[$key]->var_name])) { + if (isset($items[$key]->name) && isset($this->data[$items[$key]->name])) { if ($items[$key]->type === "grid") { $rows = $this->data[$items[$key]->name]; foreach ($rows as $keyRow => $row) {