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

Merge pull request #1016 from cchurch/fix-job-template-launch-fields

Browse Source 
Remove write-only fields from GET response for job template launch.
This commit is contained in:
Chris Church
2016-02-24 18:12:47 -05:00
parent 8dbe24cb4f 90d1a3d020
commit 5b89c5e126
2 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
awx/api/serializers.py
View File

@@ -1970,7 +1970,7 @@ class JobLaunchSerializer(BaseSerializer):
variables_needed_to_start = serializers.ReadOnlyField() variables_needed_to_start = serializers.ReadOnlyField()
credential_needed_to_start = serializers.SerializerMethodField() credential_needed_to_start = serializers.SerializerMethodField()
survey_enabled = serializers.SerializerMethodField() survey_enabled = serializers.SerializerMethodField()
extra_vars = VerbatimField(required=False) extra_vars = VerbatimField(required=False, write_only=True)
class Meta: class Meta:
model = JobTemplate model = JobTemplate
@@ -1978,18 +1978,11 @@ class JobLaunchSerializer(BaseSerializer):
'ask_variables_on_launch', 'survey_enabled', 'variables_needed_to_start', 'ask_variables_on_launch', 'survey_enabled', 'variables_needed_to_start',
'credential', 'credential_needed_to_start',) 'credential', 'credential_needed_to_start',)
read_only_fields = ('ask_variables_on_launch',) read_only_fields = ('ask_variables_on_launch',)
write_only_fields = ('credential', 'extra_vars',) extra_kwargs = {
'credential': {
def to_representation(self, obj): 'write_only': True,
res = super(JobLaunchSerializer, self).to_representation(obj) },
view = self.context.get('view', None) }
if obj and hasattr(view, '_raw_data_form_marker'):
if obj.passwords_needed_to_start:
password_keys = dict([(p, u'') for p in obj.passwords_needed_to_start])
res.update(password_keys)
if self.get_credential_needed_to_start(obj) is True:
res.update(dict(credential=''))
return res
def get_credential_needed_to_start(self, obj): def get_credential_needed_to_start(self, obj):
return not (obj and obj.credential and obj.credential.active) return not (obj and obj.credential and obj.credential.active)

15
awx/api/views.py
View File

@@ -1876,6 +1876,21 @@ class JobTemplateLaunch(RetrieveAPIView, GenericAPIView):
is_job_start = True is_job_start = True
always_allow_superuser = False 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): def post(self, request, *args, **kwargs):
obj = self.get_object() obj = self.get_object()
if not request.user.can_access(self.model, 'start', obj): if not request.user.can_access(self.model, 'start', obj):