From f9d919627007deba9ca7c5aef48f8c620817f2c2 Mon Sep 17 00:00:00 2001 From: Matthew Jones Date: Wed, 4 Jan 2017 14:23:22 -0500 Subject: [PATCH] Adding deprecation warnings Also updating New in/Added in text --- awx/api/generics.py | 1 + awx/api/templates/api/_new_in_awx.md | 11 ++++++----- awx/api/views.py | 2 ++ 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/awx/api/generics.py b/awx/api/generics.py index 73b92cfcc5..b0ca7a8842 100644 --- a/awx/api/generics.py +++ b/awx/api/generics.py @@ -156,6 +156,7 @@ class APIView(views.APIView): 'new_in_240': getattr(self, 'new_in_240', False), 'new_in_300': getattr(self, 'new_in_300', False), 'new_in_310': getattr(self, 'new_in_310', False), + 'deprecated': getattr(self, 'deprecated', False), } def get_description(self, html=False): diff --git a/awx/api/templates/api/_new_in_awx.md b/awx/api/templates/api/_new_in_awx.md index 8960aa808c..a113b9d5fa 100644 --- a/awx/api/templates/api/_new_in_awx.md +++ b/awx/api/templates/api/_new_in_awx.md @@ -3,10 +3,11 @@ {% if new_in_14 %}> _Added in AWX 1.4_{% endif %} {% if new_in_145 %}> _Added in Ansible Tower 1.4.5_{% endif %} {% if new_in_148 %}> _Added in Ansible Tower 1.4.8_{% endif %} -{% if new_in_200 %}> _New in Ansible Tower 2.0.0_{% endif %} -{% if new_in_220 %}> _New in Ansible Tower 2.2.0_{% endif %} -{% if new_in_230 %}> _New in Ansible Tower 2.3.0_{% endif %} -{% 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_200 %}> _Added in Ansible Tower 2.0.0_{% endif %} +{% if new_in_220 %}> _Added in Ansible Tower 2.2.0_{% endif %} +{% if new_in_230 %}> _Added in Ansible Tower 2.3.0_{% endif %} +{% if new_in_240 %}> _Added in Ansible Tower 2.4.0_{% endif %} +{% if new_in_300 %}> _Added in Ansible Tower 3.0.0_{% endif %} {% if new_in_310 %}> _New in Ansible Tower 3.1.0_{% endif %} +{% if deprecated %}> _This resource has been deprecated and will be removed in a future release_{% endif %} {% endif %} diff --git a/awx/api/views.py b/awx/api/views.py index de81c451cd..3b7e513ac0 100644 --- a/awx/api/views.py +++ b/awx/api/views.py @@ -3438,6 +3438,7 @@ class JobJobPlaysList(BaseJobEventsList): parent_model = Job view_name = _('Job Plays List') new_in_200 = True + deprecated = True def get(self, request, *args, **kwargs): limit = kwargs.get('limit', 20) @@ -3513,6 +3514,7 @@ class JobJobTasksList(BaseJobEventsList): parent_model = Job view_name = _('Job Play Tasks List') new_in_200 = True + deprecated = True def get(self, request, *args, **kwargs): """Return aggregate data about each of the job tasks that is: