shaba/awx
1
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2024-11-01 08:21:15 +03:00
Code Releases Activity

Merge pull request #4221 from jangsutsr/4018_prevent_multiple_print_of_version_label_in_api_help_text

Browse Source 
Prevent multiple print of version label in api help text.
This commit is contained in:
Aaron Tan 2016-12-02 11:49:15 -05:00 committed by GitHub
commit 3433343603
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
awx/api/templates/api/_new_in_awx.md
View File

@ -1,3 +1,4 @@
{% if not version_label_flag or version_label_flag == 'true' %}
{% if new_in_13 %}> _Added in AWX 1.3_{% endif %}
{% if new_in_14 %}> _Added in AWX 1.4_{% endif %}
{% if new_in_145 %}> _Added in Ansible Tower 1.4.5_{% endif %}
@ -8,3 +9,4 @@
{% if new_in_240 %}> _New in Ansible Tower 2.4.0_{% endif %}
{% if new_in_300 %}> _New in Ansible Tower 3.0.0_{% endif %}
{% if new_in_310 %}> _New in Ansible Tower 3.1.0_{% endif %}
{% endif %}

4
awx/api/templates/api/job_template_label_list.md
View File

@ -1,4 +1,6 @@
{% with 'false' as version_label_flag %}
{% include "api/sub_list_create_api_view.md" %}
{% endwith %}
Labels not associated with any other resources are deleted. A label can become disassociated with a resource as a result of 3 events.
@ -6,4 +8,6 @@ Labels not associated with any other resources are deleted. A label can become d
2. A job is deleted with labels
3. A cleanup job deletes a job with labels
{% with 'true' as version_label_flag %}
{% include "api/_new_in_awx.md" %}
{% endwith %}