Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion dojo/group/queries.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from crum import get_current_user
from django.db.models import Subquery

from dojo.authorization.authorization import get_roles_for_permission
from dojo.authorization.authorization import get_roles_for_permission, user_has_configuration_permission
from dojo.authorization.roles_permissions import Permissions
from dojo.models import Dojo_Group, Dojo_Group_Member, Product_Group, Product_Type_Group, Role
from dojo.request_cache import cache_for_request
Expand All @@ -18,6 +18,10 @@ def get_authorized_groups(permission):
if user.is_superuser:
return Dojo_Group.objects.all().order_by("name")

# Check for the case of the view_group config permission
if user_has_configuration_permission(user, "auth.view_group") or user_has_configuration_permission(user, "auth.add_group"):
return Dojo_Group.objects.all().order_by("name")

roles = get_roles_for_permission(permission)

# Get authorized group IDs via subquery
Expand Down