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

Merge branch 'master' of bitbucket.org:colosa/processmaker

Browse Source
This commit is contained in:
Daniel Rojas
2014-04-29 11:26:17 -04:00
parent 06810f7ff0 618555d9d0
commit 61800d62fc
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -570,7 +570,7 @@ class Table
public function updateTableData($pmt_uid, $pmt_data) public function updateTableData($pmt_uid, $pmt_data)
{ {
$pmt_uid = $this->validateTabUid($pmt_uid, false); $pmt_uid = $this->validateTabUid($pmt_uid, false);
$rows = $pmt_data['pmt_rows']; $rows = $pmt_data;
$rows = array_merge( array_change_key_case( $rows, CASE_LOWER ), array_change_key_case( $rows, CASE_UPPER ) ); $rows = array_merge( array_change_key_case( $rows, CASE_LOWER ), array_change_key_case( $rows, CASE_UPPER ) );
$oAdditionalTables = new AdditionalTables(); $oAdditionalTables = new AdditionalTables();

10
workflow/engine/src/ProcessMaker/Project/Bpmn.php
View File

@@ -580,9 +580,10 @@ class Bpmn extends Handler
case "bpmnActivity": $class = "BpmnActivity"; break; case "bpmnActivity": $class = "BpmnActivity"; break;
case "bpmnGateway": $class = "BpmnGateway"; break; case "bpmnGateway": $class = "BpmnGateway"; break;
case "bpmnEvent": $class = "BpmnEvent"; break; case "bpmnEvent": $class = "BpmnEvent"; break;
case "bpmnArtifact": $class = "BpmnArtifact"; break;
default: default:
throw new \RuntimeException(sprintf("Invalid Object type, accepted types: [%s|%s|%s], given %s.", throw new \RuntimeException(sprintf("Invalid Object type, accepted types: [%s|%s|%s|%s], given %s.",
"BpmnActivity", "BpmnBpmnGateway", "BpmnEvent", $data["FLO_ELEMENT_ORIGIN_TYPE"] "BpmnActivity", "BpmnBpmnGateway", "BpmnEvent", "bpmnArtifact", $data["FLO_ELEMENT_ORIGIN_TYPE"]
)); ));
} }
@@ -597,9 +598,10 @@ class Bpmn extends Handler
case "bpmnActivity": $class = "BpmnActivity"; break; case "bpmnActivity": $class = "BpmnActivity"; break;
case "bpmnGateway": $class = "BpmnGateway"; break; case "bpmnGateway": $class = "BpmnGateway"; break;
case "bpmnEvent": $class = "BpmnEvent"; break; case "bpmnEvent": $class = "BpmnEvent"; break;
case "bpmnArtifact": $class = "BpmnArtifact"; break;
default: default:
throw new \RuntimeException(sprintf("Invalid Object type, accepted types: [%s|%s|%s], given %s.", throw new \RuntimeException(sprintf("Invalid Object type, accepted types: [%s|%s|%s|%s], given %s.",
"BpmnActivity", "BpmnBpmnGateway", "BpmnEvent", $data["FLO_ELEMENT_DEST_TYPE"] "BpmnActivity", "BpmnBpmnGateway", "BpmnEvent", "bpmnArtifact", $data["FLO_ELEMENT_DEST_TYPE"]
)); ));
} }