fernando/luos
1
0
Fork 0
Code Releases Activity

Merge branch 'master' of bitbucket.org:colosa/processmaker into PM-939

Browse Source
This commit is contained in:
Victor Saisa Lopez
2015-02-06 14:46:12 -04:00
parent f2a00a4aeb cd22e5a24a
commit 41e1e588c7
4 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
workflow/engine/classes/class.pmDynaform.php
View File

@@ -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) {

2
workflow/engine/src/ProcessMaker/BusinessModel/MessageType.php
View File

@@ -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;

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

@@ -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"];

26
workflow/engine/templates/designer/index.html
View File

@@ -91,13 +91,13 @@
<li><a href="#" title="" class="mafe-button-fullscreen"></a></li>
</ul>
</nav>
</section>
</div>
<div id="p-center-layout">
<!--BODY-->
<div class="ui-layout-center tab-content" id="div-layout-canvas">
<!--TODO INSERT DIV CANVAS-->
</div>
@@ -113,19 +113,19 @@
</div>
<div class="ui-layout-west">
<div class="ui-layout-west">
<div class="bpmn_shapes">
<!--<div class="head"></div>-->
</div>
</div>
</div>
<section class="content" id="idContent">
<div class="content_controls">
<div class="head"></div>
<ul>
@@ -137,6 +137,10 @@
<a href="#" class="mafe-menu-eventmessages"></a>
<a href="#" class="btn_create mafe-menu-eventmessages-create"><span></span></a>
</li>-->
<li>
<a href="#" class="mafe-menu-messagetype"></a>
<a href="#" class="btn_create mafe-menu-messagetype-create"><span></span></a>
</li>
<li>
<a href="#" class="mafe-menu-dynaform"></a>
<a href="#" class="btn_create mafe-menu-dynaform-create"><span></span></a>