External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-04-10 12:39:22 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6912 from AlanCoding/ignored_but_not_forgotten

Browse Source 
Remove defunct entry from view method return tuple

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
This commit is contained in:
softwarefactory-project-zuul[bot]
2020-05-04 16:23:55 +00:00
committed by GitHub
parent c6d6536078 d54e5e5ed8
commit 63fec77f82
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
awx/api/views/__init__.py
View File

@@ -2337,7 +2337,6 @@ class JobTemplateLaunch(RetrieveAPIView):
old field structure to launch endpoint old field structure to launch endpoint
TODO: delete this method with future API version changes TODO: delete this method with future API version changes
''' '''
ignored_fields = {}
modern_data = data.copy() modern_data = data.copy()
id_fd = '{}_id'.format('inventory') id_fd = '{}_id'.format('inventory')
@@ -2348,14 +2347,14 @@ class JobTemplateLaunch(RetrieveAPIView):
if 'credential_passwords' not in modern_data: if 'credential_passwords' not in modern_data:
modern_data['credential_passwords'] = data.copy() modern_data['credential_passwords'] = data.copy()
return (modern_data, ignored_fields) return modern_data
def post(self, request, *args, **kwargs): def post(self, request, *args, **kwargs):
obj = self.get_object() obj = self.get_object()
try: try:
modern_data, ignored_fields = self.modernize_launch_payload( modern_data = self.modernize_launch_payload(
data=request.data, obj=obj data=request.data, obj=obj
) )
except ParseError as exc: except ParseError as exc:
@@ -2365,8 +2364,6 @@ class JobTemplateLaunch(RetrieveAPIView):
if not serializer.is_valid(): if not serializer.is_valid():
return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST) return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
ignored_fields.update(serializer._ignored_fields)
if not request.user.can_access(models.JobLaunchConfig, 'add', serializer.validated_data, template=obj): if not request.user.can_access(models.JobLaunchConfig, 'add', serializer.validated_data, template=obj):
raise PermissionDenied() raise PermissionDenied()
@@ -2382,11 +2379,11 @@ class JobTemplateLaunch(RetrieveAPIView):
data = OrderedDict() data = OrderedDict()
if isinstance(new_job, models.WorkflowJob): if isinstance(new_job, models.WorkflowJob):
data['workflow_job'] = new_job.id data['workflow_job'] = new_job.id
data['ignored_fields'] = self.sanitize_for_response(ignored_fields) data['ignored_fields'] = self.sanitize_for_response(serializer._ignored_fields)
data.update(serializers.WorkflowJobSerializer(new_job, context=self.get_serializer_context()).to_representation(new_job)) data.update(serializers.WorkflowJobSerializer(new_job, context=self.get_serializer_context()).to_representation(new_job))
else: else:
data['job'] = new_job.id data['job'] = new_job.id
data['ignored_fields'] = self.sanitize_for_response(ignored_fields) data['ignored_fields'] = self.sanitize_for_response(serializer._ignored_fields)
data.update(serializers.JobSerializer(new_job, context=self.get_serializer_context()).to_representation(new_job)) data.update(serializers.JobSerializer(new_job, context=self.get_serializer_context()).to_representation(new_job))
headers = {'Location': new_job.get_absolute_url(request)} headers = {'Location': new_job.get_absolute_url(request)}
return Response(data, status=status.HTTP_201_CREATED, headers=headers) return Response(data, status=status.HTTP_201_CREATED, headers=headers)