From 3b997cdd3a5cbda16584d9bb58d4872d0b024d1b Mon Sep 17 00:00:00 2001 From: Ryan Petrello Date: Wed, 15 Aug 2018 10:20:51 -0400 Subject: [PATCH] remove extraneous OPTIONS content re: the new named URL feature --- awx/api/generics.py | 1 - awx/api/templates/api/retrieve_api_view.md | 4 ---- awx/api/templates/api/retrieve_destroy_api_view.md | 4 ---- awx/api/templates/api/retrieve_update_api_view.md | 4 ---- awx/api/templates/api/retrieve_update_destroy_api_view.md | 4 ---- 5 files changed, 17 deletions(-) diff --git a/awx/api/generics.py b/awx/api/generics.py index f52ed95c46..01d63ff252 100644 --- a/awx/api/generics.py +++ b/awx/api/generics.py @@ -390,7 +390,6 @@ class GenericAPIView(generics.GenericAPIView, APIView): ]: d[key] = self.metadata_class().get_serializer_info(serializer, method=method) d['settings'] = settings - d['has_named_url'] = self.model in settings.NAMED_URL_GRAPH return d diff --git a/awx/api/templates/api/retrieve_api_view.md b/awx/api/templates/api/retrieve_api_view.md index 822233a00e..508c581d74 100644 --- a/awx/api/templates/api/retrieve_api_view.md +++ b/awx/api/templates/api/retrieve_api_view.md @@ -1,7 +1,3 @@ -{% if has_named_url %} -### Note: starting from api v2, this resource object can be accessed via its named URL. -{% endif %} - # Retrieve {{ model_verbose_name|title|anora }}: Make GET request to this resource to retrieve a single {{ model_verbose_name }} diff --git a/awx/api/templates/api/retrieve_destroy_api_view.md b/awx/api/templates/api/retrieve_destroy_api_view.md index e8a6d7cf96..7a01b6b152 100644 --- a/awx/api/templates/api/retrieve_destroy_api_view.md +++ b/awx/api/templates/api/retrieve_destroy_api_view.md @@ -1,7 +1,3 @@ -{% if has_named_url %} -### Note: starting from api v2, this resource object can be accessed via its named URL. -{% endif %} - {% ifmeth GET %} # Retrieve {{ model_verbose_name|title|anora }}: diff --git a/awx/api/templates/api/retrieve_update_api_view.md b/awx/api/templates/api/retrieve_update_api_view.md index 8f3bce0d06..2bb3656f46 100644 --- a/awx/api/templates/api/retrieve_update_api_view.md +++ b/awx/api/templates/api/retrieve_update_api_view.md @@ -1,7 +1,3 @@ -{% if has_named_url %} -### Note: starting from api v2, this resource object can be accessed via its named URL. -{% endif %} - {% ifmeth GET %} # Retrieve {{ model_verbose_name|title|anora }}: diff --git a/awx/api/templates/api/retrieve_update_destroy_api_view.md b/awx/api/templates/api/retrieve_update_destroy_api_view.md index 261f2cb667..6c1368a4d4 100644 --- a/awx/api/templates/api/retrieve_update_destroy_api_view.md +++ b/awx/api/templates/api/retrieve_update_destroy_api_view.md @@ -1,7 +1,3 @@ -{% if has_named_url %} -### Note: starting from api v2, this resource object can be accessed via its named URL. -{% endif %} - {% ifmeth GET %} # Retrieve {{ model_verbose_name|title|anora }}: