External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-06-15 19:57:43 -02:30
Code Issues Packages Projects Releases Wiki Activity

Fix variable names which do not meet coding standards

Browse Source
This commit is contained in:
Dirk Julich
2026-06-15 16:52:12 +02:00
parent ffadd3a5a4
commit a73a4cfae8
2 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
awx/api/views/mixin.py
View File

@@ -182,13 +182,19 @@ class OrganizationCountsMixin(object):
#
# Use independent subqueries instead of double-JOIN Count to avoid
# cartesian product.
RoleMember = Role.members.through
role_members_through = Role.members.through
member_count = Subquery(
RoleMember.objects.filter(role_id=OuterRef('member_role_id')).values('role_id').annotate(cnt=Count('user_id', distinct=True)).values('cnt'),
role_members_through.objects.filter(role_id=OuterRef('member_role_id'))
.values('role_id')
.annotate(cnt=Count('user_id', distinct=True))
.values('cnt'),
output_field=IntegerField(),
)
admin_count = Subquery(
RoleMember.objects.filter(role_id=OuterRef('admin_role_id')).values('role_id').annotate(cnt=Count('user_id', distinct=True)).values('cnt'),
role_members_through.objects.filter(role_id=OuterRef('admin_role_id'))
.values('role_id')
.annotate(cnt=Count('user_id', distinct=True))
.values('cnt'),
output_field=IntegerField(),
)
db_results['users'] = org_qs.annotate(

12
awx/api/views/organization.py
View File

@@ -80,13 +80,19 @@ class OrganizationDetail(RelatedJobsPreventDeleteMixin, RetrieveUpdateDestroyAPI
access_kwargs = {'accessor': self.request.user, 'role_field': 'read_role'}
# Use independent subqueries instead of double-JOIN Count to avoid
# cartesian product.
RoleMember = Role.members.through
role_members_through = Role.members.through
member_count = Subquery(
RoleMember.objects.filter(role_id=OuterRef('member_role_id')).values('role_id').annotate(cnt=Count('user_id', distinct=True)).values('cnt'),
role_members_through.objects.filter(role_id=OuterRef('member_role_id'))
.values('role_id')
.annotate(cnt=Count('user_id', distinct=True))
.values('cnt'),
output_field=IntegerField(),
)
admin_count = Subquery(
RoleMember.objects.filter(role_id=OuterRef('admin_role_id')).values('role_id').annotate(cnt=Count('user_id', distinct=True)).values('cnt'),
role_members_through.objects.filter(role_id=OuterRef('admin_role_id'))
.values('role_id')
.annotate(cnt=Count('user_id', distinct=True))
.values('cnt'),
output_field=IntegerField(),
)
direct_counts = (