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

Merged in mcuiza/processmaker/HOR-1295 (pull request #4480)

Browse Source 
HOR-1295
This commit is contained in:
Julio Cesar Laura Avendaño
2016-07-01 21:27:25 -04:00
parent 4c0340922d 468a05079b
commit fc76bce2f9
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7261,7 +7261,7 @@ class Cases
* @return array (criteria+array) * @return array (criteria+array)
*/ */
public function getUsersParticipatedInCase($sAppUid) public function getUsersParticipatedInCase($sAppUid, $usrStatus = '')
{ {
$c = new Criteria('workflow'); $c = new Criteria('workflow');
$c->addSelectColumn(AppDelegationPeer::APP_UID); $c->addSelectColumn(AppDelegationPeer::APP_UID);
@@ -7269,6 +7269,10 @@ class Cases
$c->addSelectColumn(UsersPeer::USR_USERNAME); $c->addSelectColumn(UsersPeer::USR_USERNAME);
$c->addSelectColumn(UsersPeer::USR_EMAIL); $c->addSelectColumn(UsersPeer::USR_EMAIL);
if($usrStatus != '') {
$c->add(UsersPeer::USR_STATUS, $usrStatus, CRITERIA::EQUAL);
}
$c->add(AppDelegationPeer::APP_UID, $sAppUid, CRITERIA::EQUAL); $c->add(AppDelegationPeer::APP_UID, $sAppUid, CRITERIA::EQUAL);
$c->addJoin(AppDelegationPeer::USR_UID, UsersPeer::USR_UID, Criteria::LEFT_JOIN); $c->addJoin(AppDelegationPeer::USR_UID, UsersPeer::USR_UID, Criteria::LEFT_JOIN);
$rs = AppDelegationPeer::doSelectRS($c); $rs = AppDelegationPeer::doSelectRS($c);

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

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