Enable/Disable users

2016-02-13 15:38:35 -05:00
parent 567d623446
commit 6161eaef9e
31 changed files with 541 additions and 72 deletions
--- a/app/Model/ProjectGroupRole.php
+++ b/app/Model/ProjectGroupRole.php
@@ -106,6 +106,7 @@ class ProjectGroupRole extends Base
            ->join(GroupMember::TABLE, 'user_id', 'id', User::TABLE)
            ->join(self::TABLE, 'group_id', 'group_id', GroupMember::TABLE)
            ->eq(self::TABLE.'.project_id', $project_id)
+            ->eq(User::TABLE.'.is_active', 1)
            ->in(self::TABLE.'.role', array(Role::PROJECT_MANAGER, Role::PROJECT_MEMBER))
            ->asc(User::TABLE.'.username')
            ->findAll();