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

BUG 6714 SOLVED.

Browse Source 
- Counting issues solved.
- Departments, Groups, Roles and Authentication Sources improved
This commit is contained in:
Enrique Ponce De Leon
2011-04-12 11:51:56 -04:00
parent 092c7e3a39
commit 729cc04733
11 changed files with 64 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -172,6 +172,7 @@ class AuthenticationSource extends BaseAuthenticationSource {
$oCriteria->addSelectColumn(RbacUsersPeer::USR_UID);
$oCriteria->addSelectColumn(AuthenticationSourcePeer::AUTH_SOURCE_NAME);
$oCriteria->addSelectColumn(AuthenticationSourcePeer::AUTH_SOURCE_PROVIDER);
$oCriteria->add(RbacUsersPeer::USR_STATUS,0,Criteria::NOT_EQUAL);
$oCriteria->addJoin(RbacUsersPeer::UID_AUTH_SOURCE, AuthenticationSourcePeer::AUTH_SOURCE_UID, Criteria::INNER_JOIN);
$oDataset = RbacUsersPeer::doSelectRS($oCriteria);

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

@@ -242,6 +242,7 @@ class RbacUsers extends BaseRbacUsers {
}else{
$oCriteria->add(RbacUsersPeer::UID_AUTH_SOURCE, $auth_source, Criteria::EQUAL);
}
$oCriteria->add(RbacUsersPeer::USR_STATUS,0,Criteria::NOT_EQUAL);
$oDataset = RbacUsersPeer::doSelectRS($oCriteria);
$oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$aUsers = array();

4
rbac/engine/classes/model/Roles.php
View File

@@ -349,7 +349,7 @@ class Roles extends BaseRoles {
$oCriteria->addSelectColumn(UsersRolesPeer::ROL_UID);
$oCriteria->addSelectColumn('COUNT(*) AS CNT');
$oCriteria->addJoin(RbacUsersPeer::USR_UID,UsersRolesPeer::USR_UID,Criteria::INNER_JOIN);
$oCriteria->add(RbacUsersPeer::USR_STATUS,'CLOSED',Criteria::NOT_EQUAL);
$oCriteria->add(RbacUsersPeer::USR_STATUS,0,Criteria::NOT_EQUAL);
$oCriteria->addGroupByColumn(UsersRolesPeer::ROL_UID);
$oDataset = UsersRolesPeer::doSelectRS($oCriteria);
$oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
@@ -396,7 +396,7 @@ class Roles extends BaseRoles {
$criteria->add(RolesPeer::ROL_UID, "", Criteria::NOT_EQUAL);
$criteria->add(RolesPeer::ROL_UID, $ROL_UID);
$criteria->add(RbacUsersPeer::USR_STATUS, 1, Criteria::EQUAL);
$criteria->add(RbacUsersPeer::USR_STATUS, 0, Criteria::NOT_EQUAL);
$criteria->addJoin(RolesPeer::ROL_UID, UsersRolesPeer::ROL_UID);
$criteria->addJoin(UsersRolesPeer::USR_UID, RbacUsersPeer::USR_UID);