fernando/luos
1
0
Fork 0
Code Releases Activity

Merged in 3.1 (pull request #4540)

Browse Source 
Updating repo 3.1-CONTENT
This commit is contained in:
Julio Cesar Laura Avendaño
2016-07-07 14:54:45 -04:00
parent 65d97aa794 5b96e90578
commit 2eac7c1ac0
39 changed files with 973 additions and 583 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
workflow/engine/classes/model/AppNotes.php
View File

@@ -226,7 +226,7 @@ class AppNotes extends BaseAppNotes
$case = new Cases();
$p = $case->getUsersParticipatedInCase($applicationUid);
$p = $case->getUsersParticipatedInCase($applicationUid, 'ACTIVE');
$noteRecipientsList = array();
foreach ($p["array"] as $key => $userParticipated) {

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

@@ -43,23 +43,37 @@ class DashletInstance extends BaseDashletInstance
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);
try {
if (!isset($data['DAS_INS_UID'])) {
$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();
$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';
} else {
$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';
}
$data['DAS_INS_UPDATE_DATE'] = date('Y-m-d H:i:s');