Fix assignable users on a group with a custom role
Groups custom roles are now handled the same ways users custom roles are.
This commit is contained in:
parent
30e9c22139
commit
fdcda3f10d
|
|
@ -114,7 +114,7 @@ class ProjectGroupRoleModel extends Base
|
||||||
->join(self::TABLE, 'group_id', 'group_id', GroupMemberModel::TABLE)
|
->join(self::TABLE, 'group_id', 'group_id', GroupMemberModel::TABLE)
|
||||||
->eq(self::TABLE.'.project_id', $project_id)
|
->eq(self::TABLE.'.project_id', $project_id)
|
||||||
->eq(UserModel::TABLE.'.is_active', 1)
|
->eq(UserModel::TABLE.'.is_active', 1)
|
||||||
->in(self::TABLE.'.role', array(Role::PROJECT_MANAGER, Role::PROJECT_MEMBER))
|
->neq(self::TABLE.'.role', Role::PROJECT_VIEWER)
|
||||||
->asc(UserModel::TABLE.'.username')
|
->asc(UserModel::TABLE.'.username')
|
||||||
->findAll();
|
->findAll();
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue