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

Merged in luisfernandosl/processmaker/HOR-1627-A-31 (pull request #4788)

Browse Source 
HOR-1627-A
This commit is contained in:
Julio Cesar Laura Avendaño
2016-08-18 17:22:09 -04:00
parent ccee3cd089 fb930edbbe
commit 8a92b8a6a4
2 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
workflow/engine/classes/class.case.php
View File

@@ -1111,15 +1111,22 @@ class Cases
$criteria = new Criteria("workflow");
$criteria->add(AppSolrQueuePeer::APP_UID, $sAppUid);
AppSolrQueuePeer::doDelete($criteria);
//Before delete verify if is a child case
$oCriteria2 = new Criteria('workflow');
$oCriteria2->add(SubApplicationPeer::APP_UID, $sAppUid);
$oCriteria2->add(SubApplicationPeer::SA_STATUS, 'ACTIVE');
if (SubApplicationPeer::doCount($oCriteria2) > 0) {
G::LoadClass('derivation');
$oDerivation = new Derivation();
$oDerivation->verifyIsCaseChild($sAppUid);
try {
//Before delete verify if is a child case
$oCriteria2 = new Criteria('workflow');
$oCriteria2->add(SubApplicationPeer::APP_UID, $sAppUid);
$oCriteria2->add(SubApplicationPeer::SA_STATUS, 'ACTIVE');
if (SubApplicationPeer::doCount($oCriteria2) > 0) {
G::LoadClass('derivation');
$oDerivation = new Derivation();
$oDerivation->verifyIsCaseChild($sAppUid);
}
} catch(Exception $e) {
Bootstrap::registerMonolog('DeleteCases', 200, 'Error in sub-process when trying to route a child case related to the case', ['application_uid' => $sAppUid, 'error' => $e->getMessage()], SYS_SYS, 'processmaker.log');
}
//Delete the registries in the table SUB_APPLICATION
$oCriteria2 = new Criteria('workflow');
$oCriteria2->add(SubApplicationPeer::APP_UID, $sAppUid);

8
workflow/engine/src/ProcessMaker/BusinessModel/Light/NotificationDevice.php
View File

@@ -7,8 +7,8 @@ use G;
class NotificationDevice
{
public function checkMobileNotifications()
{
$conf = \System::getSystemConfiguration('', '', SYS_SYS);
@@ -18,7 +18,7 @@ class NotificationDevice
}
return $activeNotifications;
}
/**
* Post Create register device with userUid
*
@@ -166,7 +166,7 @@ class NotificationDevice
$response = array();
$typeList = 'todo';
$arrayTaskUser = array();
switch ($nextDel["TAS_ASSIGN_TYPE"]) {
switch ((array_key_exists('TAS_ASSIGN_TYPE', $nextDel))? $nextDel['TAS_ASSIGN_TYPE'] : '') {
case "SELF_SERVICE":
$arrayTaskUser = $this->getTaskUserSelfService($nextDel["TAS_UID"], $appFields);
$typeList = 'unassigned';