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

PM-3380

Browse Source 
campos checkbnox no renderiza en bachrouting

PM-3380
campos checkbnox no renderiza en bachrouting

PM-3380
campos checkbnox no renderiza en bachrouting

PM-3436
New BPMN> Timer Event> Existen errores al momento de guardar una configuracion de daily, montly en timer event properties

PM-3603
0018456: Batch Routing doesn't get selected label for dropdown with query

PM-3603
0018456: Batch Routing doesn't get selected label for dropdown with query

PM-3603
0018456: Batch Routing doesn't get selected label for dropdown with query
This commit is contained in:
dheeyi
2015-09-02 13:05:13 -04:00
committed by Enrique Ponce De Leon
parent 2a25aca44c
commit 2ac9943a22
2 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -240,7 +240,7 @@ class ReportTables
if (! isset( $aData[$aField['sFieldName']] )) {
$aData[$aField['sFieldName']] = '';
}
$sQuery .= ",'" . (isset( $aData[$aField['sFieldName']] ) ? mysql_real_escape_string( $aData[$aField['sFieldName']] ) : '') . "'";
$sQuery .= ",'" . (isset( $aData[$aField['sFieldName']] ) ? @mysql_real_escape_string( $aData[$aField['sFieldName']] ) : '') . "'";
break;
case 'date':
$value = (isset( $aData[$aField['sFieldName']] ) && trim( $aData[$aField['sFieldName']] )) != '' ? "'" . $aData[$aField['sFieldName']] . "'" : 'NULL';
@@ -600,11 +600,14 @@ class ReportTables
if (! isset( $aFields[$aField['sFieldName']] )) {
$aFields[$aField['sFieldName']] = '';
}
if(is_array($aFields[$aField['sFieldName']])){
$sQuery .= "'" . (isset( $aFields[$aField['sFieldName']] ) ? $aFields[$aField['sFieldName']][0] : '') . "',";
}else{
if($aFields[$aField['sFieldName']] == $aFields[$aField['sFieldName'].'_label']){
$sQuery .= "'" . (isset( $aFields[$aField['sFieldName']] ) ? @mysql_real_escape_string( $aFields[$aField['sFieldName']] ) : '') . "',";
}else{
$sQuery .= "'" . (isset( $aFields[$aField['sFieldName']] ) ? @mysql_real_escape_string( $aFields[$aField['sFieldName'].'_label'] ) : '') . "',";
}
}
break;
case 'date':

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

@@ -463,7 +463,6 @@ class Consolidated
$json = G::json_decode($dataTask["DYN_CONTENT"]);
$pmDyna->jsonr($json);
$fieldsDyna = $json->items[0]->items;
$xmlfrm = new \stdclass();
$xmlfrm->fields = array();
foreach ($fieldsDyna as $key => $value) {
@@ -478,7 +477,7 @@ class Consolidated
$temp->required = (isset($val->required)) ? $val->required : 0;
$temp->mode = (isset($val->mode)) ? $val->mode : 'edit';
if (!empty($val->options)) {
if (!empty($val->options) || !empty($val->optionsSql)) {
$temp->storeData = '[';
foreach ($val->options as $valueOption) {
if(isset($valueOption->value)){
@@ -487,6 +486,14 @@ class Consolidated
$temp->storeData .= '["' . $valueOption['value'] . '", "' . $valueOption['label'] . '"],';
}
}
foreach ($val->optionsSql as $valueOption) {
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 .= ']';
}