diff --git a/rbac/engine/classes/model/AuthenticationSource.php b/rbac/engine/classes/model/AuthenticationSource.php
index e1d923f1e..7bee5ea02 100644
--- a/rbac/engine/classes/model/AuthenticationSource.php
+++ b/rbac/engine/classes/model/AuthenticationSource.php
@@ -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);
diff --git a/rbac/engine/classes/model/RbacUsers.php b/rbac/engine/classes/model/RbacUsers.php
index c1c0b330d..fe492e1ae 100644
--- a/rbac/engine/classes/model/RbacUsers.php
+++ b/rbac/engine/classes/model/RbacUsers.php
@@ -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();
diff --git a/rbac/engine/classes/model/Roles.php b/rbac/engine/classes/model/Roles.php
index 5f69bd585..75ca3835e 100644
--- a/rbac/engine/classes/model/Roles.php
+++ b/rbac/engine/classes/model/Roles.php
@@ -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);
diff --git a/workflow/engine/classes/model/GroupUser.php b/workflow/engine/classes/model/GroupUser.php
index 1926a391b..a13b998d5 100644
--- a/workflow/engine/classes/model/GroupUser.php
+++ b/workflow/engine/classes/model/GroupUser.php
@@ -104,6 +104,8 @@ class GroupUser extends BaseGroupUser {
$oCriteria = new Criteria('workflow');
$oCriteria->addSelectColumn(GroupUserPeer::GRP_UID);
$oCriteria->addSelectColumn('COUNT(*) AS CNT');
+ $oCriteria->addJoin(GroupUserPeer::USR_UID, UsersPeer::USR_UID, Criteria::INNER_JOIN);
+ $oCriteria->add(UsersPeer::USR_STATUS,'CLOSED', Criteria::NOT_EQUAL);
$oCriteria->addGroupByColumn(GroupUserPeer::GRP_UID);
$oDataset = GroupUserPeer::doSelectRS($oCriteria);
$oDataset->setFetchmode (ResultSet::FETCHMODE_ASSOC);
diff --git a/workflow/engine/methods/departments/departments_Ajax.php b/workflow/engine/methods/departments/departments_Ajax.php
index 6e91c1e25..3047fe342 100644
--- a/workflow/engine/methods/departments/departments_Ajax.php
+++ b/workflow/engine/methods/departments/departments_Ajax.php
@@ -290,6 +290,9 @@ switch ($_POST['action'])
$oCriteria->addSelectColumn(UsersPeer::USR_USERNAME);
$oCriteria->addSelectColumn(UsersPeer::USR_FIRSTNAME);
$oCriteria->addSelectColumn(UsersPeer::USR_LASTNAME);
+ $oCriteria->addSelectColumn(UsersPeer::USR_STATUS);
+ $oCriteria->add(UsersPeer::DEP_UID,'');
+ $oCriteria->add(UsersPeer::USR_STATUS,'CLOSED',Criteria::NOT_EQUAL);
if ($filter!=''){
$oCriteria->add(
$oCriteria->getNewCriterion(UsersPeer::USR_USERNAME, '%'.$filter.'%',Criteria::LIKE)->addOr(
@@ -316,8 +319,9 @@ switch ($_POST['action'])
$oCriteria->addSelectColumn(UsersPeer::USR_USERNAME);
$oCriteria->addSelectColumn(UsersPeer::USR_FIRSTNAME);
$oCriteria->addSelectColumn(UsersPeer::USR_LASTNAME);
+ $oCriteria->addSelectColumn(UsersPeer::USR_STATUS);
$oCriteria->add(UsersPeer::DEP_UID,'');
-$oCriteria->add(UsersPeer::USR_STATUS,'CLOSED',Criteria::NOT_EQUAL);
+ $oCriteria->add(UsersPeer::USR_STATUS,'CLOSED',Criteria::NOT_EQUAL);
if ($filter!=''){
$oCriteria->add(
diff --git a/workflow/engine/methods/groups/groups_Ajax.php b/workflow/engine/methods/groups/groups_Ajax.php
index ca2913fff..06f1e581c 100644
--- a/workflow/engine/methods/groups/groups_Ajax.php
+++ b/workflow/engine/methods/groups/groups_Ajax.php
@@ -206,9 +206,10 @@ switch ($_POST['action'])
$oCriteria->addSelectColumn(UsersPeer::USR_FIRSTNAME);
$oCriteria->addSelectColumn(UsersPeer::USR_LASTNAME);
$oCriteria->addSelectColumn(UsersPeer::USR_EMAIL);
+ $oCriteria->addSelectColumn(UsersPeer::USR_STATUS);
$oCriteria->addJoin(GroupUserPeer::USR_UID, UsersPeer::USR_UID, Criteria::LEFT_JOIN);
$oCriteria->add(GroupUserPeer::GRP_UID, $sGroupUID);
- $oCriteria->add(UsersPeer::USR_STATUS, 'ACTIVE');
+ $oCriteria->add(UsersPeer::USR_STATUS, 'CLOSED', Criteria::NOT_EQUAL);
$filter = (isset($_POST['textFilter']))? $_POST['textFilter'] : '';
if ($filter != ''){
$oCriteria->add(
@@ -233,7 +234,7 @@ switch ($_POST['action'])
$oCriteria->addSelectColumn(UsersPeer::USR_UID);
$oCriteria->addJoin(GroupUserPeer::USR_UID, UsersPeer::USR_UID, Criteria::LEFT_JOIN);
$oCriteria->add(GroupUserPeer::GRP_UID, $sGroupUID);
- $oCriteria->add(UsersPeer::USR_STATUS, 'ACTIVE');
+ $oCriteria->add(UsersPeer::USR_STATUS, 'CLOSED', Criteria::NOT_EQUAL);
$oDataset = UsersPeer::doSelectRS($oCriteria);
$oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$oDataset->next();
@@ -248,7 +249,8 @@ switch ($_POST['action'])
$oCriteria->addSelectColumn(UsersPeer::USR_FIRSTNAME);
$oCriteria->addSelectColumn(UsersPeer::USR_LASTNAME);
$oCriteria->addSelectColumn(UsersPeer::USR_EMAIL);
- $oCriteria->add(UsersPeer::USR_STATUS, 'ACTIVE');
+ $oCriteria->addSelectColumn(UsersPeer::USR_STATUS);
+ $oCriteria->add(UsersPeer::USR_STATUS, 'CLOSED', Criteria::NOT_EQUAL);
$oCriteria->add(UsersPeer::USR_UID, $uUIDs, Criteria::NOT_IN);
$filter = (isset($_POST['textFilter']))? $_POST['textFilter'] : '';
if ($filter != ''){
diff --git a/workflow/engine/methods/users/users_Ajax.php b/workflow/engine/methods/users/users_Ajax.php
index 102e01138..d62aeb832 100644
--- a/workflow/engine/methods/users/users_Ajax.php
+++ b/workflow/engine/methods/users/users_Ajax.php
@@ -367,17 +367,20 @@ try {
$oCriteria->getNewCriterion(UsersPeer::USR_LASTNAME,'%'.$filter.'%',Criteria::LIKE)));
$oCriteria->add($cc);
}
- $sw_add = false;
- for ($i=0; $i < sizeof($aUsers); $i++){
- if ($i>0){
- $tmpL = $tmpL->addOr($oCriteria->getNewCriterion(UsersPeer::USR_UID, $aUsers[$i],Criteria::EQUAL));
- }else{
- $uList = $oCriteria->getNewCriterion(UsersPeer::USR_UID, $aUsers[$i],Criteria::EQUAL);
- $tmpL = $uList;
- $sw_add = true;
- }
+// $sw_add = false;
+// for ($i=0; $i < sizeof($aUsers); $i++){
+// if ($i>0){
+// $tmpL = $tmpL->addOr($oCriteria->getNewCriterion(UsersPeer::USR_UID, $aUsers[$i],Criteria::EQUAL));
+// }else{
+// $uList = $oCriteria->getNewCriterion(UsersPeer::USR_UID, $aUsers[$i],Criteria::EQUAL);
+// $tmpL = $uList;
+// $sw_add = true;
+// }
+// }
+// if ($sw_add) $oCriteria->add($uList);
+ if (sizeof($aUsers) > 0){
+ $oCriteria->add(UsersPeer::USR_UID, $aUsers, Criteria::IN);
}
- if ($sw_add) $oCriteria->add($uList);
$oCriteria->setOffset($start);
$oCriteria->setLimit($limit);
$oDataset = UsersPeer::DoSelectRs ($oCriteria);
diff --git a/workflow/engine/templates/authSources/authSourcesList.js b/workflow/engine/templates/authSources/authSourcesList.js
index 15245abde..9965392a9 100755
--- a/workflow/engine/templates/authSources/authSourcesList.js
+++ b/workflow/engine/templates/authSources/authSourcesList.js
@@ -180,7 +180,7 @@ Ext.onReady(function(){
{header: _('ID_SERVER_NAME'), dataIndex: 'AUTH_SOURCE_SERVER_NAME', width: 180, hidden: false, align: 'center'},
{header: _('ID_PORT'), dataIndex: 'AUTH_SOURCE_PORT', width: 60, hidden: false, align: 'center'},
{header: _('ID_ENABLED_TLS'), dataIndex: 'AUTH_SOURCE_ENABLED_TLS', width: 90, hidden: false, align: 'center', renderer: show_enabled},
- {header: _('ID_CURRENT_USERS'), dataIndex: 'CURRENT_USERS', width: 90, hidden: false, align: 'center'}
+ {header: _('ID_ACTIVE_USERS'), dataIndex: 'CURRENT_USERS', width: 90, hidden: false, align: 'center'}
]
});
diff --git a/workflow/engine/templates/departments/departmentUsers.js b/workflow/engine/templates/departments/departmentUsers.js
index 5dd1c32dc..1e312be26 100755
--- a/workflow/engine/templates/departments/departmentUsers.js
+++ b/workflow/engine/templates/departments/departmentUsers.js
@@ -92,7 +92,8 @@ Ext.onReady(function(){
{name : 'USR_USERNAME'},
{name : 'USR_FIRSTNAME'},
{name : 'USR_LASTNAME'},
- {name : 'USR_SUPERVISOR'}
+ {name : 'USR_SUPERVISOR'},
+ {name : 'USR_STATUS'}
]
})
});
@@ -107,7 +108,8 @@ Ext.onReady(function(){
{name : 'USR_UID'},
{name : 'USR_USERNAME'},
{name : 'USR_FIRSTNAME'},
- {name : 'USR_LASTNAME'}
+ {name : 'USR_LASTNAME'},
+ {name : 'USR_STATUS'}
]
})
});
@@ -119,7 +121,8 @@ Ext.onReady(function(){
},
columns: [
{id:'USR_UID', dataIndex: 'USR_UID', hidden:true, hideable:false},
- {header: _('ID_FULL_NAME'), dataIndex: 'USR_USERNAME', width: 60, align:'left', renderer: show_user}
+ {header: _('ID_FULL_NAME'), dataIndex: 'USR_USERNAME', width: 200, align:'left', renderer: show_user},
+ {header: _('ID_STATUS'), dataIndex: 'USR_STATUS', width: 100, align:'center', renderer: render_status}
]
});
@@ -528,4 +531,13 @@ UpdateSupervisor = function(){
viewport.getEl().unmask();
}
});
+};
+
+//Render Status
+render_status = function(v){
+ switch(v){
+ case 'ACTIVE': return '' + _('ID_ACTIVE') + ''; break;
+ case 'INACTIVE': return '' + _('ID_INACTIVE') + '';; break;
+ case 'VACATION': return '' + _('ID_VACATION') + '';; break;
+ }
};
\ No newline at end of file
diff --git a/workflow/engine/templates/groups/groupsMembers.js b/workflow/engine/templates/groups/groupsMembers.js
index 61c09a592..1c69f88a4 100644
--- a/workflow/engine/templates/groups/groupsMembers.js
+++ b/workflow/engine/templates/groups/groupsMembers.js
@@ -71,7 +71,8 @@ Ext.onReady(function(){
{name : 'USR_USERNAME'},
{name : 'USR_FIRSTNAME'},
{name : 'USR_LASTNAME'},
- {name : 'USR_EMAIL'}
+ {name : 'USR_EMAIL'},
+ {name : 'USR_STATUS'}
]
})
});
@@ -129,7 +130,8 @@ Ext.onReady(function(){
{name : 'USR_USERNAME'},
{name : 'USR_FIRSTNAME'},
{name : 'USR_LASTNAME'},
- {name : 'USR_EMAIL'}
+ {name : 'USR_EMAIL'},
+ {name : 'USR_STATUS'}
]
})
});
@@ -142,8 +144,9 @@ Ext.onReady(function(){
columns: [
{id:'USR_UID', dataIndex: 'USR_UID', hidden:true, hideable:false},
{header: _('ID_USER_NAME'), dataIndex: 'USR_USERNAME', width: 140, align:'left'},
- {header: _('ID_FIRST_NAME'), dataIndex: 'USR_FIRSTNAME', width: 200, align:'left'},
- {header: _('ID_LAST_NAME'), dataIndex: 'USR_LASTNAME', width: 200, align:'left'}
+ {header: _('ID_FIRST_NAME'), dataIndex: 'USR_FIRSTNAME', width: 180, align:'left'},
+ {header: _('ID_LAST_NAME'), dataIndex: 'USR_LASTNAME', width: 180, align:'left'},
+ {header: _('ID_STATUS'), dataIndex: 'USR_STATUS', width: 100, align:'center', renderer: render_status}
]
@@ -444,4 +447,13 @@ CancelEditMembersAction = function(){
buttonsPanel.hide();
editMembersButton.enable();
MembersPanel.doLayout();
+};
+
+//Render Status
+render_status = function(v){
+ switch(v){
+ case 'ACTIVE': return '' + _('ID_ACTIVE') + ''; break;
+ case 'INACTIVE': return '' + _('ID_INACTIVE') + '';; break;
+ case 'VACATION': return '' + _('ID_VACATION') + '';; break;
+ }
};
\ No newline at end of file
diff --git a/workflow/engine/templates/roles/rolesList.js b/workflow/engine/templates/roles/rolesList.js
index 148ff3c17..c37acd950 100755
--- a/workflow/engine/templates/roles/rolesList.js
+++ b/workflow/engine/templates/roles/rolesList.js
@@ -242,9 +242,9 @@ Ext.onReady(function(){
{header: _('ID_CODE'), dataIndex: 'ROL_CODE', width: 220, align:'left'},
{header: _('ID_NAME'), dataIndex: 'ROL_NAME', width: 180, hidden:false, align:'left'},
{header: _('ID_STATUS'), dataIndex: 'ROL_STATUS', width: 80, hidden: false, align: 'center', renderer: status_role},
- {header: _('ID_USERS'), dataIndex: 'TOTAL_USERS', width: 50, hidden: false, align: 'center'},
- {header: _('ID_PRO_CREATE_DATE'), dataIndex: 'ROL_CREATE_DATE', width: 100, hidden:false, align:'center', renderer: render_date},
- {header: _('ID_LAN_UPDATE_DATE'), dataIndex: 'ROL_UPDATE_DATE', width: 100, hidden:false, align:'center', renderer: render_date}
+ {header: _('ID_ACTIVE_USERS'), dataIndex: 'TOTAL_USERS', width: 80, hidden: false, align: 'center'},
+ {header: _('ID_PRO_CREATE_DATE'), dataIndex: 'ROL_CREATE_DATE', width: 90, hidden:false, align:'center', renderer: render_date},
+ {header: _('ID_LAN_UPDATE_DATE'), dataIndex: 'ROL_UPDATE_DATE', width: 90, hidden:false, align:'center', renderer: render_date}
]
});