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

Merged in ronald-quentaprocessmaker/processmaker/HOR-1760 (pull request #4851)

Browse Source 
HOR-1760
This commit is contained in:
David Callizaya
2016-09-01 15:41:03 -04:00
parent b1534386f4 4fe8a6b500
commit db477509b2
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
workflow/engine/classes/class.groups.php
View File

@@ -209,6 +209,8 @@ class Groups
$oCriteria = new Criteria('workflow'); $oCriteria = new Criteria('workflow');
$oCriteria->addSelectColumn(GroupwfPeer::GRP_UID); $oCriteria->addSelectColumn(GroupwfPeer::GRP_UID);
$oCriteria->addSelectColumn(GroupwfPeer::GRP_STATUS); $oCriteria->addSelectColumn(GroupwfPeer::GRP_STATUS);
$oCriteria->addAsColumn('CON_VALUE',GroupwfPeer::GRP_TITLE);
$oCriteria->addAscendingOrderByColumn(GroupwfPeer::GRP_TITLE);
$oCriteria->add(GroupwfPeer::GRP_UID, $gUIDs, Criteria::NOT_IN); $oCriteria->add(GroupwfPeer::GRP_UID, $gUIDs, Criteria::NOT_IN);
$oCriteria->add(GroupwfPeer::GRP_STATUS, 'ACTIVE'); $oCriteria->add(GroupwfPeer::GRP_STATUS, 'ACTIVE');
if ($filter != '') { if ($filter != '') {
@@ -234,6 +236,8 @@ class Groups
$oCriteria->addSelectColumn(GroupwfPeer::GRP_UID); $oCriteria->addSelectColumn(GroupwfPeer::GRP_UID);
$oCriteria->addSelectColumn(GroupwfPeer::GRP_STATUS); $oCriteria->addSelectColumn(GroupwfPeer::GRP_STATUS);
$oCriteria->addSelectColumn(GroupwfPeer::GRP_LDAP_DN); $oCriteria->addSelectColumn(GroupwfPeer::GRP_LDAP_DN);
$oCriteria->addAsColumn('CON_VALUE',GroupwfPeer::GRP_TITLE);
$oCriteria->addAscendingOrderByColumn(GroupwfPeer::GRP_TITLE);
$oCriteria->addJoin(GroupUserPeer::GRP_UID, GroupwfPeer::GRP_UID, Criteria::LEFT_JOIN); $oCriteria->addJoin(GroupUserPeer::GRP_UID, GroupwfPeer::GRP_UID, Criteria::LEFT_JOIN);
$oCriteria->add(GroupUserPeer::USR_UID, $sUserUid, Criteria::EQUAL); $oCriteria->add(GroupUserPeer::USR_UID, $sUserUid, Criteria::EQUAL);
$oCriteria->add(GroupwfPeer::GRP_STATUS, 'ACTIVE'); $oCriteria->add(GroupwfPeer::GRP_STATUS, 'ACTIVE');