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

PM-3163

Browse Source
This commit is contained in:
marcelo.cuiza
2015-07-31 11:18:25 -04:00
parent 6cc02b9f9f
commit 9520c0bb7b
2 changed files with 24 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -967,6 +967,8 @@ class DynaForm
if ($record["DYN_VERSION"] == 0) { if ($record["DYN_VERSION"] == 0) {
$record["DYN_VERSION"] = 1; $record["DYN_VERSION"] = 1;
} }
$record["DYN_CONTENT"] = preg_replace("/\\\\u([a-f0-9]{4})/e", "iconv('UCS-4LE','UTF-8',pack('V', hexdec('U$1')))", $record["DYN_CONTENT"]);
return array( return array(
$this->getFieldNameByFormatFieldName("DYN_UID") => $record["DYN_UID"], $this->getFieldNameByFormatFieldName("DYN_UID") => $record["DYN_UID"],

38
workflow/engine/src/ProcessMaker/BusinessModel/Variable.php
View File

@@ -75,12 +75,7 @@ class Variable
$variable->setVarDefault($arrayData["VAR_DEFAULT"]); $variable->setVarDefault($arrayData["VAR_DEFAULT"]);
} }
if (isset($arrayData["VAR_ACCEPTED_VALUES"])) { if (isset($arrayData["VAR_ACCEPTED_VALUES"])) {
$VAR_ACCEPTED_VALUES = $arrayData["VAR_ACCEPTED_VALUES"]; $encodeAcceptedValues = \G::json_encode($arrayData["VAR_ACCEPTED_VALUES"]);
foreach($VAR_ACCEPTED_VALUES as $key => $val) {
$VAR_ACCEPTED_VALUES[$key]["label"] = htmlentities($val["label"], ENT_IGNORE, 'UTF-8');
$VAR_ACCEPTED_VALUES[$key]["value"] = htmlentities($val["value"], ENT_IGNORE, 'UTF-8');
}
$encodeAcceptedValues = html_entity_decode(json_encode($VAR_ACCEPTED_VALUES), ENT_IGNORE, 'UTF-8');
$variable->setVarAcceptedValues($encodeAcceptedValues); $variable->setVarAcceptedValues($encodeAcceptedValues);
} }
$variable->save(); $variable->save();
@@ -173,12 +168,7 @@ class Variable
$variable->setVarDefault($arrayData["VAR_DEFAULT"]); $variable->setVarDefault($arrayData["VAR_DEFAULT"]);
} }
if (isset($arrayData["VAR_ACCEPTED_VALUES"])) { if (isset($arrayData["VAR_ACCEPTED_VALUES"])) {
$VAR_ACCEPTED_VALUES = $arrayData["VAR_ACCEPTED_VALUES"]; $encodeAcceptedValues = \G::json_encode($arrayData["VAR_ACCEPTED_VALUES"]);
foreach($VAR_ACCEPTED_VALUES as $key => $val) {
$VAR_ACCEPTED_VALUES[$key]["label"] = htmlentities($val["label"], ENT_IGNORE,'UTF-8');
$VAR_ACCEPTED_VALUES[$key]["value"] = htmlentities($val["value"], ENT_IGNORE,'UTF-8');
}
$encodeAcceptedValues = html_entity_decode(json_encode($VAR_ACCEPTED_VALUES), ENT_IGNORE, 'UTF-8');
$variable->setVarAcceptedValues($encodeAcceptedValues); $variable->setVarAcceptedValues($encodeAcceptedValues);
} }
$variable->save(); $variable->save();
@@ -299,6 +289,14 @@ class Variable
$arrayVariables = array(); $arrayVariables = array();
while ($aRow = $rsCriteria->getRow()) { while ($aRow = $rsCriteria->getRow()) {
$VAR_ACCEPTED_VALUES = \G::json_decode($aRow['VAR_ACCEPTED_VALUES'], true);
if(sizeof($VAR_ACCEPTED_VALUES)) {
$encodeAcceptedValues = preg_replace("/\\\\u([a-f0-9]{4})/e", "iconv('UCS-4LE','UTF-8',pack('V', hexdec('U$1')))", \G::json_encode($VAR_ACCEPTED_VALUES));
} else {
$encodeAcceptedValues = $aRow['VAR_ACCEPTED_VALUES'];
}
$arrayVariables = array('var_uid' => $aRow['VAR_UID'], $arrayVariables = array('var_uid' => $aRow['VAR_UID'],
'prj_uid' => $aRow['PRJ_UID'], 'prj_uid' => $aRow['PRJ_UID'],
'var_name' => $aRow['VAR_NAME'], 'var_name' => $aRow['VAR_NAME'],
@@ -310,7 +308,7 @@ class Variable
'var_sql' => $aRow['VAR_SQL'], 'var_sql' => $aRow['VAR_SQL'],
'var_null' => (int)$aRow['VAR_NULL'], 'var_null' => (int)$aRow['VAR_NULL'],
'var_default' => $aRow['VAR_DEFAULT'], 'var_default' => $aRow['VAR_DEFAULT'],
'var_accepted_values' => $aRow['VAR_ACCEPTED_VALUES']); 'var_accepted_values' => $encodeAcceptedValues);
$rsCriteria->next(); $rsCriteria->next();
} }
//Return //Return
@@ -365,6 +363,14 @@ class Variable
$arrayVariables = array(); $arrayVariables = array();
while ($aRow = $rsCriteria->getRow()) { while ($aRow = $rsCriteria->getRow()) {
$VAR_ACCEPTED_VALUES = \G::json_decode($aRow['VAR_ACCEPTED_VALUES'], true);
if(sizeof($VAR_ACCEPTED_VALUES)) {
$encodeAcceptedValues = preg_replace("/\\\\u([a-f0-9]{4})/e", "iconv('UCS-4LE','UTF-8',pack('V', hexdec('U$1')))", \G::json_encode($VAR_ACCEPTED_VALUES));
} else {
$encodeAcceptedValues = $aRow['VAR_ACCEPTED_VALUES'];
}
$arrayVariables[] = array('var_uid' => $aRow['VAR_UID'], $arrayVariables[] = array('var_uid' => $aRow['VAR_UID'],
'prj_uid' => $aRow['PRJ_UID'], 'prj_uid' => $aRow['PRJ_UID'],
'var_name' => $aRow['VAR_NAME'], 'var_name' => $aRow['VAR_NAME'],
@@ -376,7 +382,7 @@ class Variable
'var_sql' => $aRow['VAR_SQL'], 'var_sql' => $aRow['VAR_SQL'],
'var_null' => (int)$aRow['VAR_NULL'], 'var_null' => (int)$aRow['VAR_NULL'],
'var_default' => $aRow['VAR_DEFAULT'], 'var_default' => $aRow['VAR_DEFAULT'],
'var_accepted_values' => $aRow['VAR_ACCEPTED_VALUES']); 'var_accepted_values' => $encodeAcceptedValues);
$rsCriteria->next(); $rsCriteria->next();
} }
//Return //Return
@@ -609,7 +615,7 @@ class Variable
$row = $rsCriteria->getRow(); $row = $rsCriteria->getRow();
$contentDecode = json_decode($row["DYN_CONTENT"], true); $contentDecode = \G::json_decode($row["DYN_CONTENT"], true);
$content = $contentDecode['items'][0]['items']; $content = $contentDecode['items'][0]['items'];
if (is_array($content)) { if (is_array($content)) {
foreach ($content as $key => $value) { foreach ($content as $key => $value) {
@@ -730,4 +736,4 @@ class Variable
throw $e; throw $e;
} }
} }
} }