External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-13 11:00:03 -03:30
Code Issues Packages Projects Releases Wiki Activity

Removing some unneeded comments from activity stream queryset

Browse Source
This commit is contained in:
Matthew Jones 2013-11-19 08:02:43 -05:00
parent 812aafdfef
commit be43447903
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
awx/api/views.py
View File

@ -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