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

show capabilities on launch and relaunch, remove unintended capabilities

Browse Source
This commit is contained in:
AlanCoding
2016-09-28 16:02:00 -04:00
parent 17f70fbc21
commit 2f205a6862
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
awx/api/serializers.py
View File

@@ -1075,7 +1075,6 @@ class InventoryDetailSerializer(InventorySerializer):
class InventoryScriptSerializer(InventorySerializer): class InventoryScriptSerializer(InventorySerializer):
show_capabilities = ['copy', 'edit', 'delete']
class Meta: class Meta:
fields = () fields = ()

6
awx/api/views.py
View File

@@ -2282,7 +2282,7 @@ class JobTemplateLaunch(RetrieveAPIView, GenericAPIView):
else: else:
data = OrderedDict() data = OrderedDict()
data['ignored_fields'] = ignored_fields data['ignored_fields'] = ignored_fields
data.update(JobSerializer(new_job).to_representation(new_job)) data.update(JobSerializer(new_job, context=self.get_serializer_context()).to_representation(new_job))
data['job'] = new_job.id data['job'] = new_job.id
return Response(data, status=status.HTTP_201_CREATED) return Response(data, status=status.HTTP_201_CREATED)
@@ -2965,7 +2965,7 @@ class JobRelaunch(RetrieveAPIView, GenericAPIView):
data = dict(passwords_needed_to_start=new_job.passwords_needed_to_start) data = dict(passwords_needed_to_start=new_job.passwords_needed_to_start)
return Response(data, status=status.HTTP_400_BAD_REQUEST) return Response(data, status=status.HTTP_400_BAD_REQUEST)
else: else:
data = JobSerializer(new_job).data data = JobSerializer(new_job, context=self.get_serializer_context()).data
# Add job key to match what old relaunch returned. # Add job key to match what old relaunch returned.
data['job'] = new_job.id data['job'] = new_job.id
headers = {'Location': new_job.get_absolute_url()} headers = {'Location': new_job.get_absolute_url()}
@@ -3423,7 +3423,7 @@ class AdHocCommandRelaunch(GenericAPIView):
data = dict(passwords_needed_to_start=new_ad_hoc_command.passwords_needed_to_start) data = dict(passwords_needed_to_start=new_ad_hoc_command.passwords_needed_to_start)
return Response(data, status=status.HTTP_400_BAD_REQUEST) return Response(data, status=status.HTTP_400_BAD_REQUEST)
else: else:
data = AdHocCommandSerializer(new_ad_hoc_command).data data = AdHocCommandSerializer(new_ad_hoc_command, context=self.get_serializer_context()).data
# Add ad_hoc_command key to match what was previously returned. # Add ad_hoc_command key to match what was previously returned.
data['ad_hoc_command'] = new_ad_hoc_command.id data['ad_hoc_command'] = new_ad_hoc_command.id
headers = {'Location': new_ad_hoc_command.get_absolute_url()} headers = {'Location': new_ad_hoc_command.get_absolute_url()}