Merge branch 'devel' into rbac

awx/api/views.py

@@ -1896,6 +1896,21 @@ class JobTemplateLaunch(RetrieveAPIView, GenericAPIView):
     is_job_start = True
     always_allow_superuser = False
 
+    def update_raw_data(self, data):
+        obj = self.get_object()
+        extra_vars = data.get('extra_vars') or {}
+        if obj:
+            for p in obj.passwords_needed_to_start:
+                data[p] = u''
+            if obj.credential and obj.credential.active:
+                data.pop('credential', None)
+            else:
+                data['credential'] = None
+            for v in obj.variables_needed_to_start:
+                extra_vars.setdefault(v, u'')
+        data['extra_vars'] = extra_vars
+        return data
+
     def post(self, request, *args, **kwargs):
         obj = self.get_object()
         if not request.user.can_access(self.model, 'start', obj):
@@ -1945,7 +1960,7 @@ class JobTemplateSurveySpec(GenericAPIView):
 
     model = JobTemplate
     parent_model = JobTemplate
-    # FIXME: Add serializer class to define fields in OPTIONS request!
+    serializer_class = EmptySerializer
 
     def get(self, request, *args, **kwargs):
         obj = self.get_object()
@@ -2024,8 +2039,8 @@ class JobTemplateActivityStreamList(SubListAPIView):
 class JobTemplateCallback(GenericAPIView):
 
     model = JobTemplate
-    # FIXME: Add serializer class to define fields in OPTIONS request!
     permission_classes = (JobTemplateCallbackPermission,)
+    serializer_class = EmptySerializer
 
     @csrf_exempt
     @transaction.non_atomic_requests
@@ -2207,7 +2222,7 @@ class SystemJobTemplateDetail(RetrieveAPIView):
 class SystemJobTemplateLaunch(GenericAPIView):
 
     model = SystemJobTemplate
-    # FIXME: Add serializer class to define fields in OPTIONS request!
+    serializer_class = EmptySerializer
 
     def get(self, request, *args, **kwargs):
         return Response({})
@@ -2278,7 +2293,7 @@ class JobActivityStreamList(SubListAPIView):
 class JobStart(GenericAPIView):
 
     model = Job
-    # FIXME: Add serializer class to define fields in OPTIONS request!
+    serializer_class = EmptySerializer
     is_job_start = True
 
     def get(self, request, *args, **kwargs):