From be4344790353a5712fdf2bc406979bcbf17d0fd1 Mon Sep 17 00:00:00 2001 From: Matthew Jones Date: Tue, 19 Nov 2013 08:02:43 -0500 Subject: [PATCH] Removing some unneeded comments from activity stream queryset --- awx/api/views.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/awx/api/views.py b/awx/api/views.py index 21a4f11fc7..38b74069f6 100644 --- a/awx/api/views.py +++ b/awx/api/views.py @@ -1041,7 +1041,7 @@ class JobJobEventsList(BaseJobEventsList): authentication_classes = [JobTaskAuthentication] + \ api_settings.DEFAULT_AUTHENTICATION_CLASSES permission_classes = (JobTaskPermission,) - + # Post allowed for job event callback only. def post(self, request, *args, **kwargs): parent_obj = get_object_or_404(self.parent_model, pk=self.kwargs['pk']) @@ -1073,8 +1073,8 @@ class ActivityStreamList(SimpleListAPIView): type_qs = get_user_queryset(self.request.user, eval(this_type)) ids = [t.id for t in type_qs] if len(ids) > 0: - all_qs = all_qs | (Q(object1_type=this_type) & Q(object1_id__in=ids)) #ActivityStream.objects.filter(object1_type=this_type, object1_id__in=ids) - all_qs = all_qs | (Q(object2_type=this_type) & Q(object2_id__in=ids)) #ActivityStream.objects.filter(object2_type=this_type, object2_id__in=ids) + all_qs = all_qs | (Q(object1_type=this_type) & Q(object1_id__in=ids)) + all_qs = all_qs | (Q(object2_type=this_type) & Q(object2_id__in=ids)) except Exception, e: logger.warn("Error: " + str(e)) continue