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

Merge remote-tracking branch 'origin/release/3.2' into bugfix/HOR-2964

Browse Source
This commit is contained in:
dheeyi william
2017-04-04 12:14:33 -04:00
parent b1188bc6a2 68ce4d02a6
commit d7a7962609
2 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
workflow/engine/classes/class.processes.php
View File

@@ -5686,6 +5686,14 @@ class Processes
return $oData;
}
/**
* @param $modelClass
* @param $uidTableField
* @param $idTableField
* @param $data
* @return array
* @throws Exception
*/
private function loadIdsFor($modelClass, $uidTableField, $idTableField,
&$data)
{
@@ -5693,7 +5701,7 @@ class Processes
return $data;
}
if (!is_array($data)) {
throw new Exception("Invalid input data form $modelClass($key)".G::json_encode($data));
throw new Exception("Invalid input data form $modelClass($key)" . G::json_encode($data));
}
$uidTableFieldArray = explode('.', $uidTableField);
$idTableFieldArray = explode('.', $idTableField);
@@ -5707,17 +5715,19 @@ class Processes
$idField = $idTableFieldArray[1];
if (isset($data[$uidField])) {
//$data is an single row
$model = new $modelClass();
$row = $model->load($data[$uidField]);
$data[$idField] = $model->getByName($idTableField,
BasePeer::TYPE_COLNAME);
$modelPeer = $modelClass . 'Peer';
$oRow = $modelPeer::retrieveByPK($data[$uidField]);
if (!is_null($oRow)) {
$data[$idField] = $oRow->getByName($idTableField, BasePeer::TYPE_COLNAME);
}
} else {
//$data is an array of row
foreach ($data as $i => $dataRow) {
$model = new $modelClass();
$row = $model->load($dataRow[$uidField]);
$data[$i][$idField] = $model->getByName($idTableField,
BasePeer::TYPE_COLNAME);
$modelPeer = $modelClass . 'Peer';
$oRow = $modelPeer::retrieveByPK($dataRow[$uidField]);
if (!is_null($oRow)) {
$data[$i][$idField] = $oRow->getByName($idTableField, BasePeer::TYPE_COLNAME);
}
}
}
return $data;

2
workflow/engine/methods/cases/cases_Step.php
View File

@@ -418,7 +418,7 @@ try {
$oHeadPublisher = & headPublisher::getSingleton();
$titleDocument = "<h3>" . $Fields['INP_DOC_TITLE'] . "<br><small>" . G::LoadTranslation( 'ID_INPUT_DOCUMENT' ) . "</small></h3>";
$titleDocument = "<h3>" . htmlspecialchars($Fields['INP_DOC_TITLE'], ENT_QUOTES) . "<br><small>" . G::LoadTranslation('ID_INPUT_DOCUMENT') . "</small></h3>";
if ($Fields['INP_DOC_DESCRIPTION']) {
$titleDocument .= " " . str_replace( "\n", "", str_replace( "'", "\'", nl2br( html_entity_decode($Fields['INP_DOC_DESCRIPTION'], ENT_COMPAT, "UTF-8") ) ) ) . "";
}