fernando/luos
1
0
Fork 0
Code Releases Activity

PM-3340

Browse Source 
0018094: Batch routing doesn-t work in ProcessMaker 3.0.x
This commit is contained in:
dheeyi
2015-08-25 10:30:37 -04:00
parent 4e0cf96964
commit 0d999ce2b8
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
workflow/engine/classes/class.consolidatedCases.php
View File

@@ -88,7 +88,11 @@ class ConsolidatedCases
$json = G::json_decode($dataDyna["DYN_CONTENT"]);
$fieldsDyna = $json->items[0]->items;
foreach ($fieldsDyna as $value) {
$_POST['form']['FIELDS'][] = ($value[0]->type !== 'panel') ? $value[0]->name . '-' . $value[0]->type : $value[0]->id . '-' . $value[0]->type;
if(isset($value[0]->type)){
if ($value[0]->type == 'text' || $value[0]->type == 'textarea' || $value[0]->type == 'dropdown' || $value[0]->type == 'checkbox' || $value[0]->type == 'datetime' || $value[0]->type == 'yesno' || $value[0]->type == 'date' || $value[0]->type == 'hidden' || $value[0]->type == 'currency' || $value[0]->type == 'percentage' || $value[0]->type == 'link'){
$_POST['form']['FIELDS'][] = $value[0]->name . '-' . $value[0]->type;
}
}
}
$aFieldsClases = array();

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

@@ -467,7 +467,7 @@ class Consolidated
$xmlfrm = new \stdclass();
$xmlfrm->fields = array();
foreach ($fieldsDyna as $key => $value) {
if ($value[0]->type == 'title' || $value[0]->type == 'submit' || $value[0]->type == 'panel' || $value[0]->type == 'image' || $value[0]->type == 'button' || $value[0]->type == 'grid' || $value[0]->type == 'checkgroup' || $value[0]->type == 'radiogroup' || $value[0]->type == 'radio' || $value[0]->type == 'hidden' || $value[0]->type == 'link' || $value[0]->type == 'file' || $value[0]->type == 'subform') {
if ($value[0]->type == 'title' || $value[0]->type == 'submit' || $value[0]->type == 'panel' || $value[0]->type == 'image' || $value[0]->type == 'button' || $value[0]->type == 'grid' || $value[0]->type == 'checkgroup' || $value[0]->type == 'radiogroup' || $value[0]->type == 'radio' || $value[0]->type == 'hidden' || $value[0]->type == 'link' || $value[0]->type == 'file' || $value[0]->type == 'subform' || $value[0]->type == 'label') {
continue;
}
$temp = new \stdclass();
@@ -480,7 +480,11 @@ class Consolidated
if (!empty($value[0]->options)) {
$temp->storeData = '[';
foreach ($value[0]->options as $valueOption) {
@$temp->storeData .= '["' . $valueOption->value . '", "' . $valueOption->label . '"],';
if(isset($valueOption->value)){
$temp->storeData .= '["' . $valueOption->value . '", "' . $valueOption->label . '"],';
}else{
$temp->storeData .= '["' . $valueOption['value'] . '", "' . $valueOption['label'] . '"],';
}
}
$temp->storeData = substr($temp->storeData,0,-1);
$temp->storeData .= ']';