From 6f28361bf5d63148ec471bc8d2321cd0da6f3e7c Mon Sep 17 00:00:00 2001 From: Jeff Bradberry Date: Mon, 17 Feb 2020 15:37:12 -0500 Subject: [PATCH] Make serialize_asset use Pages to a greater extent --- awxkit/awxkit/cli/resource.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/awxkit/awxkit/cli/resource.py b/awxkit/awxkit/cli/resource.py index f4f3a837a6..5499bd19c6 100644 --- a/awxkit/awxkit/cli/resource.py +++ b/awxkit/awxkit/cli/resource.py @@ -225,20 +225,20 @@ class Export(CustomCommand): def serialize_asset(self, asset, options): fields = { - key: asset.json[key] for key in options - if key in asset.json and options[key]['type'] != 'id' + key: asset[key] for key in options + if key in asset.json and key not in asset.related } fk_fields = { key: self.get_natural_key(asset.related[key].get()) for key in options - if key in asset.json and options[key]['type'] == 'id' + if key in asset.related } related = {} for k, related_endpoint in asset.related.items(): if k != 'roles': continue - data = related_endpoint.get(all_pages=True).json + data = related_endpoint.get(all_pages=True) if 'results' in data: related[k] = [self.get_natural_key(x) for x in data.results]