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

Merged in victorsl/processmaker/HOR-1118-31 (pull request #4483)

Browse Source 
HOR-1118
This commit is contained in:
Julio Cesar Laura Avendaño
2016-07-06 17:10:48 -04:00
parent 504d771b2f 5ece254eae
commit a6cd2681ce
1 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
workflow/engine/classes/model/DashletInstance.php
View File

@@ -43,23 +43,37 @@ class DashletInstance extends BaseDashletInstance
unset($data[$field]); unset($data[$field]);
} }
} }
if (!empty($additionalFields)) {
$data['DAS_INS_ADDITIONAL_PROPERTIES'] = serialize($additionalFields);
} else {
$data['DAS_INS_ADDITIONAL_PROPERTIES'] = '';
}
$connection = Propel::getConnection(DashletInstancePeer::DATABASE_NAME); $connection = Propel::getConnection(DashletInstancePeer::DATABASE_NAME);
try { try {
if (!isset($data['DAS_INS_UID'])) { if (!isset($data['DAS_INS_UID'])) {
$data['DAS_INS_UID'] = ''; $data['DAS_INS_UID'] = '';
} }
if ($data['DAS_INS_UID'] == '') { if ($data['DAS_INS_UID'] == '') {
$data['DAS_INS_UID'] = G::generateUniqueID();
$data['DAS_INS_CREATE_DATE'] = date('Y-m-d H:i:s');
$dashletInstance = new DashletInstance(); $dashletInstance = new DashletInstance();
$data['DAS_INS_UID'] = G::generateUniqueID();
$data['DAS_INS_ADDITIONAL_PROPERTIES'] = (!empty($additionalFields))? serialize($additionalFields) : '';
$data['DAS_INS_CREATE_DATE'] = date('Y-m-d H:i:s');
$msg = 'CreateDashletInstance'; $msg = 'CreateDashletInstance';
} else { } else {
$dashletInstance = DashletInstancePeer::retrieveByPK($data['DAS_INS_UID']); $dashletInstance = DashletInstancePeer::retrieveByPK($data['DAS_INS_UID']);
if (!empty($additionalFields)) {
$arrayAdditionalProperties = [];
if ($dashletInstance->getDasInsAdditionalProperties() != '') {
$arrayAux = unserialize($dashletInstance->getDasInsAdditionalProperties());
$arrayAdditionalProperties = (is_array($arrayAux))? $arrayAux : $arrayAdditionalProperties;
}
$additionalFields = array_merge($arrayAdditionalProperties, $additionalFields);
$data['DAS_INS_ADDITIONAL_PROPERTIES'] = serialize($additionalFields);
}
$msg = 'UpdateDashletInstance'; $msg = 'UpdateDashletInstance';
} }
$data['DAS_INS_UPDATE_DATE'] = date('Y-m-d H:i:s'); $data['DAS_INS_UPDATE_DATE'] = date('Y-m-d H:i:s');