From 84a3aeec6716c759b1d1ff7b3f7c29f45c09c938 Mon Sep 17 00:00:00 2001 From: Aaron Tan Date: Thu, 1 Dec 2016 21:54:20 -0500 Subject: [PATCH] Prevent multiple print of version label in api help text. --- awx/api/templates/api/_new_in_awx.md | 2 ++ awx/api/templates/api/job_template_label_list.md | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/awx/api/templates/api/_new_in_awx.md b/awx/api/templates/api/_new_in_awx.md index 711c56983a..8960aa808c 100644 --- a/awx/api/templates/api/_new_in_awx.md +++ b/awx/api/templates/api/_new_in_awx.md @@ -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 %} diff --git a/awx/api/templates/api/job_template_label_list.md b/awx/api/templates/api/job_template_label_list.md index 9d503e9c65..fa2163141b 100644 --- a/awx/api/templates/api/job_template_label_list.md +++ b/awx/api/templates/api/job_template_label_list.md @@ -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 %}