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

Merged in cochalo/processmaker/PM-1957 (pull request #1842)

Browse Source 
PM-1957 Correccion en validacion al guardar CONSOLIDATED
This commit is contained in:
Julio Cesar Laura Avendaño
2015-04-03 11:43:52 -04:00
parent 046ba0525d 75ffa73623
commit 91939f5179
2 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
workflow/engine/classes/class.consolidatedCases.php
View File

@@ -6,6 +6,7 @@ class ConsolidatedCases
{
function saveConsolidated ($data)
{
$status = $data['con_status'];
$sTasUid = $data['tas_uid'];
$sDynUid = $data['dyn_uid'];
$sProUid = $data['pro_uid'];
@@ -14,11 +15,21 @@ class ConsolidatedCases
$title = $data['title'];
if ($sRepTabUid != '') {
if (!$status) {
$oCaseConsolidated = new CaseConsolidated();
$oCaseConsolidated = CaseConsolidatedPeer::retrieveByPK($sTasUid);
if (!(is_object($oCaseConsolidated)) || get_class($oCaseConsolidated) != 'CaseConsolidated') {
$oCaseConsolidated = new CaseConsolidated();
$oCaseConsolidated->setTasUid($sTasUid);
$oCaseConsolidated->setConStatus('INACTIVE');
$oCaseConsolidated->save();
}
return 1;
}
$rptUid = null;
$criteria = new Criteria();
$criteria->addSelectColumn(ReportTablePeer::REP_TAB_UID);
$criteria->add(ReportTablePeer::REP_TAB_NAME, $tableName);
$criteria->add(ReportTablePeer::REP_TAB_UID, $sRepTabUid);
$rsCriteria = ReportTablePeer::doSelectRS($criteria);
if ($rsCriteria->next()) {
@@ -39,6 +50,7 @@ class ConsolidatedCases
@unlink($sPath . PATH_SEP . 'map' . PATH_SEP . $sClassName . 'MapBuilder.php');
@unlink($sPath . PATH_SEP . 'om' . PATH_SEP . 'Base' . $sClassName . '.php');
@unlink($sPath . PATH_SEP . 'om' . PATH_SEP . 'Base' . $sClassName . 'Peer.php');
$sRepTabUid = '';
}

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

@@ -387,6 +387,7 @@ class Task
G::LoadClass("consolidatedCases");
$consolidated = new \ConsolidatedCases();
$dataConso = array(
'con_status' => $arrayProperty['CONSOLIDATE_DATA']['consolidated_enable'],
'tas_uid' => $arrayProperty['TAS_UID'],
'dyn_uid' => $arrayProperty['CONSOLIDATE_DATA']['consolidated_dynaform'],
'pro_uid' => $arrayProperty['PRO_UID'],
@@ -395,7 +396,6 @@ class Task
'title' => $arrayProperty['CONSOLIDATE_DATA']['consolidated_title']
);
$consolidated->saveConsolidated($dataConso);
}
$arrayResult["status"] = "OK";