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

Merged in bugfix/PMCORE-2809 (pull request #7799)

Browse Source 
PMCORE-2809 LDAP user imported counter is adding +1 when the user logged in ProcessMaker first time

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
This commit is contained in:
Roly Rudy Gutierrez Pinto
2021-02-01 18:27:51 +00:00
committed by Julio Cesar Laura Avendaño
parent 25447d0669 500dda0636
commit f1cb3cef88
2 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
rbac/engine/classes/model/RbacUsers.php
View File

@@ -307,6 +307,7 @@ class RbacUsers extends BaseRbacUsers
$criteria->addSelectColumn(RbacUsersPeer::UID_AUTH_SOURCE);
$criteria->addSelectColumn('COUNT(*) AS CNT');
$criteria->add(RbacUsersPeer::USR_STATUS, 'CLOSED', Criteria::NOT_EQUAL);
$criteria->add(RbacUsersPeer::USR_USERNAME, '', Criteria::NOT_EQUAL);
$criteria->addGroupByColumn(RbacUsersPeer::UID_AUTH_SOURCE);
$dataset = RbacUsersPeer::doSelectRS($criteria, Propel::getDbConnection('rbac_ro'));
$dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);

1
workflow/engine/classes/LdapAdvanced.php
View File

@@ -1273,6 +1273,7 @@ class LdapAdvanced
$c1 = new Criteria("rbac");
$c1->add(RbacUsersPeer::UID_AUTH_SOURCE, $arrayAuthSource["AUTH_SOURCE_UID"]);
$c1->add(RbacUsersPeer::USR_AUTH_USER_DN, $strUser);
$c1->add(RbacUsersPeer::USR_STATUS, 1);
// update set
$c2 = new Criteria("rbac");
$c2->add(RbacUsersPeer::USR_AUTH_USER_DN, $userDn);