fernando/luos
1
0
Fork 0
Code Releases Activity

Merged in gproly/processmaker/PM-3919 (pull request #3152)

Browse Source 
PM-3919
This commit is contained in:
Julio Cesar Laura Avendaño
2015-11-19 12:11:16 -04:00
parent 681a6443f3 6cf6e4b17e
commit 901c1ef61f
2 changed files with 33 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
workflow/engine/classes/class.reportTables.php
View File

@@ -603,6 +603,9 @@ class ReportTables
if(is_array($aFields[$aField['sFieldName']])){
$sQuery .= "'" . (isset( $aFields[$aField['sFieldName']] ) ? $aFields[$aField['sFieldName']][0] : '') . "',";
}else{
if (!isset($aFields[$aField['sFieldName'] . '_label'])) {
$aFields[$aField['sFieldName'].'_label'] = '';
}
if($aFields[$aField['sFieldName']] == $aFields[$aField['sFieldName'].'_label']){
$sQuery .= "'" . (isset( $aFields[$aField['sFieldName']] ) ? @mysql_real_escape_string( $aFields[$aField['sFieldName']] ) : '') . "',";
}else{

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

@@ -467,9 +467,7 @@ class Consolidated
$xmlfrm->fields = array();
foreach ($fieldsDyna as $key => $value) {
foreach ($value as $val) {
if ($val->type == 'title' || $val->type == 'submit' || $val->type == 'panel' || $val->type == 'image' || $val->type == 'button' || $val->type == 'grid' || $val->type == 'checkgroup' || $val->type == 'radiogroup' || $val->type == 'radio' || $val->type == 'hidden' || $val->type == 'link' || $val->type == 'file' || $val->type == 'subform' || $val->type == 'label') {
continue;
}
if (isset($val->type) && ($val->type == 'text' || $val->type == 'textarea' || $val->type == 'dropdown' || $val->type == 'checkbox' || $val->type == 'datetime')) {
$temp = new \stdclass();
$temp->type = $val->type;
$temp->label = $val->label;
@@ -509,6 +507,7 @@ class Consolidated
$xmlfrm->fields[] = $temp;
}
}
}
} else {
$filename = $pro_uid . PATH_SEP . $dyn_uid . ".xml";
if (!class_exists('Smarty')) {