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

Compensating for default of '' for a JSON typed field

Browse Source
This commit is contained in:
John Westcott IV
2020-03-17 15:48:24 -04:00
committed by beeankha
parent 9dbf75f2a9
commit 357e22eb51
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
awx_collection/tools/templates/tower_module.j2
View File

@@ -41,8 +41,13 @@ options:
{% endif %} {% endif %}
required: {{ item['json']['actions']['POST'][option]['required'] }} required: {{ item['json']['actions']['POST'][option]['required'] }}
type: {{ type_map[ item['json']['actions']['POST'][option]['type'] ] }} type: {{ type_map[ item['json']['actions']['POST'][option]['type'] ] }}
{% if item['json']['actions']['POST'][option].get('default', '') != '' %} {% if 'default' in item['json']['actions']['POST'][option] %}
default: {{ item['json']['actions']['POST'][option]['default'] }} {# for tower_job_template/extra vars, its type is dict but its default is '', so we want to make that {} #}
{% if item['json']['actions']['POST'][option]['default'] == '' and type_map[ item['json']['actions']['POST'][option]['type'] ] == 'dict' %}
default: {}
{% else %}
default: '{{ item['json']['actions']['POST'][option]['default'] }}'
{% endif %}
{% endif %} {% endif %}
{% if 'choices' in item['json']['actions']['POST'][option] %} {% if 'choices' in item['json']['actions']['POST'][option] %}
choices: choices:
@@ -106,7 +111,11 @@ def main():
{{ option_data.append('choices=[{}]'.format(all_choices | join(', '))) -}} {{ option_data.append('choices=[{}]'.format(all_choices | join(', '))) -}}
{% endif %} {% endif %}
{% if item['json']['actions']['POST'][option].get('default', '') != '' %} {% if item['json']['actions']['POST'][option].get('default', '') != '' %}
{{ option_data.append("default='{}'".format(item['json']['actions']['POST'][option]['default'])) -}} {% set default_value = item['json']['actions']['POST'][option]['default'] %}
{% if item['json']['actions']['POST'][option]['default'] == '' and type_map[ item['json']['actions']['POST'][option]['type'] ] == 'dict' %}
{% set default_value = '{}' %}
{% endif %}
{{ option_data.append("default='{}'".format(default_value)) -}}
{% endif %} {% endif %}
{% if aliases[item_type][option] | default(False) %} {% if aliases[item_type][option] | default(False) %}
{% set alias_list = [] %} {% set alias_list = [] %}