resolve conflict: index.html

awx/api/views.py

@@ -2406,6 +2406,7 @@ class JobTemplateLabelList(DeleteLastUnattachLabelMixin, SubListCreateAttachDeta
     serializer_class = LabelSerializer
     parent_model = JobTemplate
     relationship = 'labels'
+    new_in_300 = True
 
     def post(self, request, *args, **kwargs):
         # If a label already exists in the database, attach it instead of erroring out
@@ -2699,6 +2700,7 @@ class WorkflowJobTemplateList(ListCreateAPIView):
     model = WorkflowJobTemplate
     serializer_class = WorkflowJobTemplateListSerializer
     always_allow_superuser = False
+    new_in_310 = True
 
     # TODO: RBAC
     '''
@@ -2716,10 +2718,12 @@ class WorkflowJobTemplateDetail(RetrieveUpdateDestroyAPIView):
     model = WorkflowJobTemplate
     serializer_class = WorkflowJobTemplateSerializer
     always_allow_superuser = False
+    new_in_310 = True
 
 
 class WorkflowJobTemplateLabelList(JobTemplateLabelList):
     parent_model = WorkflowJobTemplate
+    new_in_310 = True
 
 
 # TODO:
@@ -2727,6 +2731,7 @@ class WorkflowJobTemplateLaunch(GenericAPIView):
 
     model = WorkflowJobTemplate
     serializer_class = EmptySerializer
+    new_in_310 = True
 
     def get(self, request, *args, **kwargs):
         data = {}
@@ -2752,6 +2757,12 @@ class WorkflowJobTemplateWorkflowNodesList(SubListCreateAPIView):
     parent_model = WorkflowJobTemplate
     relationship = 'workflow_job_template_nodes'
     parent_key = 'workflow_job_template'
+    new_in_310 = True
+
+    def update_raw_data(self, data):
+        for fd in ['job_type', 'job_tags', 'skip_tags', 'limit', 'skip_tags']:
+            data[fd] = None
+        return super(WorkflowJobTemplateWorkflowNodesList, self).update_raw_data(data)
 
 # TODO:
 class WorkflowJobTemplateJobsList(SubListAPIView):
@@ -2767,12 +2778,14 @@ class WorkflowJobList(ListCreateAPIView):
 
     model = WorkflowJob
     serializer_class = WorkflowJobListSerializer
+    new_in_310 = True
 
 # TODO:
 class WorkflowJobDetail(RetrieveDestroyAPIView):
 
     model = WorkflowJob
     serializer_class = WorkflowJobSerializer
+    new_in_310 = True
 
 class WorkflowJobWorkflowNodesList(SubListAPIView):
 
@@ -2782,6 +2795,7 @@ class WorkflowJobWorkflowNodesList(SubListAPIView):
     parent_model = WorkflowJob
     relationship = 'workflow_job_nodes'
     parent_key = 'workflow_job'
+    new_in_310 = True
 
 class SystemJobTemplateList(ListAPIView):
 
@@ -3052,21 +3066,6 @@ class GroupJobEventsList(BaseJobEventsList):
 class JobJobEventsList(BaseJobEventsList):
 
     parent_model = Job
-    authentication_classes = [TaskAuthentication] + api_settings.DEFAULT_AUTHENTICATION_CLASSES
-    permission_classes = (TaskPermission,)
-
-    # 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'])
-        data = request.data.copy()
-        data['job'] = parent_obj.pk
-        serializer = self.get_serializer(data=data)
-        if serializer.is_valid():
-            self.instance = serializer.save()
-            headers = {'Location': serializer.data['url']}
-            return Response(serializer.data, status=status.HTTP_201_CREATED,
-                            headers=headers)
-        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
 
 class JobJobPlaysList(BaseJobEventsList):
 
@@ -3457,25 +3456,8 @@ class HostAdHocCommandEventsList(BaseAdHocCommandEventsList):
 class AdHocCommandAdHocCommandEventsList(BaseAdHocCommandEventsList):
 
     parent_model = AdHocCommand
-    authentication_classes = [TaskAuthentication] + api_settings.DEFAULT_AUTHENTICATION_CLASSES
-    permission_classes = (TaskPermission,)
     new_in_220 = True
 
-    # Post allowed for ad hoc event callback only.
-    def post(self, request, *args, **kwargs):
-        if request.user:
-            raise PermissionDenied()
-        parent_obj = get_object_or_404(self.parent_model, pk=self.kwargs['pk'])
-        data = request.data.copy()
-        data['ad_hoc_command'] = parent_obj
-        serializer = self.get_serializer(data=data)
-        if serializer.is_valid():
-            self.instance = serializer.save()
-            headers = {'Location': serializer.data['url']}
-            return Response(serializer.data, status=status.HTTP_201_CREATED,
-                            headers=headers)
-        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
-
 
 class AdHocCommandActivityStreamList(SubListAPIView):
 
@@ -3586,7 +3568,11 @@ class UnifiedJobStdout(RetrieveAPIView):
             dark_bg = (content_only and dark) or (not content_only and (dark or not dark_val))
             content, start, end, absolute_end = unified_job.result_stdout_raw_limited(start_line, end_line)
 
+            # Remove any ANSI escape sequences containing job event data.
+            content = re.sub(r'\x1b\[K(?:[A-Za-z0-9+/=]+\x1b\[\d+D)+\x1b\[K', '', content)
+
             body = ansiconv.to_html(cgi.escape(content))
+
             context = {
                 'title': get_view_name(self.__class__),
                 'body': mark_safe(body),