diff --git a/awx/api/filters.py b/awx/api/filters.py index d81134799c..93972ce67c 100644 --- a/awx/api/filters.py +++ b/awx/api/filters.py @@ -220,7 +220,7 @@ class FieldLookupBackend(BaseFilterBackend): q = Q(**{k:v}) queryset = queryset.filter(q) queryset = queryset.filter(*args) - return queryset.distinct() + return queryset except (FieldError, FieldDoesNotExist, ValueError), e: raise ParseError(e.args[0]) except ValidationError, e: diff --git a/awx/api/views.py b/awx/api/views.py index 1e72d18bee..3e70cb8099 100644 --- a/awx/api/views.py +++ b/awx/api/views.py @@ -3573,7 +3573,7 @@ class RoleChildrenList(SubListAPIView): # XXX: This should be the intersection between the roles of the user # and the roles that the requesting user has access to see role = Role.objects.get(pk=self.kwargs['pk']) - return role.children + return role.children.all()