forked from enviPath/enviPy
Adding users to a group or setting permissions on a package now filter for active users. Also any inactive members of group/package get marked as such.
<img width="490" alt="{3B906C71-F3AE-41E4-A61C-B8377D79F685}.png" src="attachments/09cf149a-9d7a-4560-8ce7-9f3487527ee2">
Reviewed-on: enviPath/enviPy#329
Co-authored-by: Liam Brydon <lbry121@aucklanduni.ac.nz>
Co-committed-by: Liam Brydon <lbry121@aucklanduni.ac.nz>
This commit is contained in:
@ -1049,6 +1049,7 @@ def package(request, package_uuid):
|
||||
"user_id", flat=True
|
||||
)
|
||||
)
|
||||
users = users.filter(is_active=True)
|
||||
|
||||
group_perms = GroupPackagePermission.objects.filter(package=current_package)
|
||||
groups = Group.objects.exclude(
|
||||
@ -2699,8 +2700,10 @@ def group(request, group_uuid):
|
||||
|
||||
context["group"] = current_group
|
||||
|
||||
context["users"] = UserManager.get_users_lp().exclude(
|
||||
id__in=current_group.user_member.all()
|
||||
context["users"] = (
|
||||
UserManager.get_users_lp()
|
||||
.exclude(id__in=current_group.user_member.all())
|
||||
.filter(is_active=True)
|
||||
)
|
||||
context["groups"] = (
|
||||
GroupManager.get_groups_lp()
|
||||
|
||||
Reference in New Issue
Block a user