diff --git a/awx/api/views/__init__.py b/awx/api/views/__init__.py index ab25ed12c6..82aacdbdc9 100644 --- a/awx/api/views/__init__.py +++ b/awx/api/views/__init__.py @@ -4023,9 +4023,11 @@ class BaseAdHocCommandEventsList(NoTruncateMixin, SubListAPIView): search_fields = ('stdout',) def get_queryset(self): - adhoc = self.get_parent_object() - self.check_parent_access(adhoc) - return adhoc.get_event_queryset() + parent = self.get_parent_object() + self.check_parent_access(parent) + if isinstance(parent, models.Host): + return super(BaseAdHocCommandEventsList, self).get_queryset() + return parent.get_event_queryset() class HostAdHocCommandEventsList(BaseAdHocCommandEventsList):