External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-16 13:57:39 -02:30
Code Issues Packages Projects Releases Wiki Activity

Implement AC-1279, rename vars_prompt_on_launch to ask_variables_on_launch

Browse Source 
Conflicts:
	awx/main/models/jobs.py
This commit is contained in:
Matthew Jones
2014-05-15 10:23:45 -04:00
parent a895c6beea
commit c7ed154149
5 changed files with 444 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
awx/api/serializers.py
View File

@@ -1213,7 +1213,7 @@ class JobTemplateSerializer(UnifiedJobTemplateSerializer, JobOptionsSerializer):
class Meta:
model = JobTemplate
fields = ('*', 'host_config_key', 'vars_prompt_on_launch')
fields = ('*', 'host_config_key', 'ask_variables_on_launch')
def get_related(self, obj):
res = super(JobTemplateSerializer, self).get_related(obj)
@@ -1230,11 +1230,11 @@ class JobTemplateSerializer(UnifiedJobTemplateSerializer, JobOptionsSerializer):
class JobSerializer(UnifiedJobSerializer, JobOptionsSerializer):
passwords_needed_to_start = serializers.Field(source='passwords_needed_to_start')
vars_prompt_on_launch = serializers.Field(source='vars_prompt_on_launch')
ask_variables_on_launch = serializers.Field(source='ask_variables_on_launch')
class Meta:
model = Job
fields = ('*', 'job_template', 'passwords_needed_to_start', 'vars_prompt_on_launch')
fields = ('*', 'job_template', 'passwords_needed_to_start', 'ask_variables_on_launch')
def get_related(self, obj):
res = super(JobSerializer, self).get_related(obj)

2
awx/api/views.py
View File

@@ -1325,7 +1325,7 @@ class JobStart(GenericAPIView):
)
if obj.can_start:
data['passwords_needed_to_start'] = obj.passwords_needed_to_start
data['vars_prompt_on_launch'] = obj.vars_prompt_on_launch
data['ask_variables_on_launch'] = obj.ask_variables_on_launch
return Response(data)
def post(self, request, *args, **kwargs):