External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-12 15:14:45 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'tower/test_stable-2.6' into merge_26_2

Browse Source
This commit is contained in:
AlanCoding
2025-09-04 23:06:53 -04:00
parent 51eb109dbe 7dc4f149a7
commit 8fb6a3a633
127 changed files with 14455 additions and 345 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
awx/api/generics.py
View File

@@ -162,9 +162,9 @@ def get_view_description(view, html=False):
def get_default_schema():
if settings.DYNACONF.is_development_mode:
from awx.api.swagger import schema_view
from awx.api.swagger import AutoSchema
return schema_view
return AutoSchema()
else:
return views.APIView.schema
@@ -844,7 +844,7 @@ class ResourceAccessList(ParentMixin, ListAPIView):
if settings.ANSIBLE_BASE_ROLE_SYSTEM_ACTIVATED:
ancestors = set(RoleEvaluation.objects.filter(content_type_id=content_type.id, object_id=obj.id).values_list('role_id', flat=True))
qs = User.objects.filter(has_roles__in=ancestors) | User.objects.filter(is_superuser=True)
auditor_role = RoleDefinition.objects.filter(name="Controller System Auditor").first()
auditor_role = RoleDefinition.objects.filter(name="Platform Auditor").first()
if auditor_role:
qs |= User.objects.filter(role_assignments__role_definition=auditor_role)
return qs.distinct()