From 1f7c1af64ec2ff69abd317db7e984403247d2e1f Mon Sep 17 00:00:00 2001 From: Jeff Bradberry Date: Fri, 1 May 2020 11:44:03 -0400 Subject: [PATCH] Fix WFJT nodes endpoint to return node pages when posting not the node list page. --- awxkit/awxkit/api/pages/api.py | 1 - awxkit/awxkit/api/pages/page.py | 4 +++- awxkit/awxkit/api/pages/workflow_job_template_nodes.py | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/awxkit/awxkit/api/pages/api.py b/awxkit/awxkit/api/pages/api.py index 60e6e959e4..f18a5cce1c 100644 --- a/awxkit/awxkit/api/pages/api.py +++ b/awxkit/awxkit/api/pages/api.py @@ -225,7 +225,6 @@ class ApiV2(base.Base): else: self._related.put((_page, name, S)) - def _assign_roles(self): while True: try: diff --git a/awxkit/awxkit/api/pages/page.py b/awxkit/awxkit/api/pages/page.py index 338f370a90..65a6290bb6 100644 --- a/awxkit/awxkit/api/pages/page.py +++ b/awxkit/awxkit/api/pages/page.py @@ -562,11 +562,13 @@ class PageCache(object): return self.options.setdefault(url, options) def set_page(self, page): - log.debug("set_page: %s", page.endpoint) + log.debug("set_page: %s %s", type(page), page.endpoint) self.pages_by_url[page.endpoint] = page if getattr(page, 'NATURAL_KEY', None): + log.debug("set_page has natural key fields.") natural_key = page.get_natural_key(cache=self) if natural_key is not None: + log.debug("set_page natural_key: %s", repr(natural_key)) self.pages_by_natural_key[utils.freeze(natural_key)] = page.endpoint if 'results' in page: for p in page.results: diff --git a/awxkit/awxkit/api/pages/workflow_job_template_nodes.py b/awxkit/awxkit/api/pages/workflow_job_template_nodes.py index 1b61754928..5494d6063b 100644 --- a/awxkit/awxkit/api/pages/workflow_job_template_nodes.py +++ b/awxkit/awxkit/api/pages/workflow_job_template_nodes.py @@ -123,8 +123,8 @@ class WorkflowJobTemplateNode(HasCreate, base.Base): page.register_page([resources.workflow_job_template_node, - (resources.workflow_job_template_nodes, - 'post')], + (resources.workflow_job_template_nodes, 'post'), + (resources.workflow_job_template_workflow_nodes, 'post')], WorkflowJobTemplateNode)