summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsoftwarefactory-project-zuul[bot] <33884098+softwarefactory-project-zuul[bot]@users.noreply.github.com>2019-07-17 18:17:53 +0200
committerGitHub <noreply@github.com>2019-07-17 18:17:53 +0200
commit41b0367627a490914187f0be0ed3cfc8bbea0ee6 (patch)
treead9900bfabf5f1d1b34fbf86026529b415f66b1e
parentMerge pull request #4328 from jakemcdermott/nested-hashi-kv-v2-engine-names (diff)
parentfix a 500 error for Activity Stream job records w/ a missing JT (diff)
downloadawx-41b0367627a490914187f0be0ed3cfc8bbea0ee6.tar.xz
awx-41b0367627a490914187f0be0ed3cfc8bbea0ee6.zip
Merge pull request #4337 from ryanpetrello/activity-stream-missing-jt
fix a 500 error for Activity Stream job records w/ a missing JT Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
-rw-r--r--awx/api/serializers.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/awx/api/serializers.py b/awx/api/serializers.py
index d336587de0..b3d4e4c2b6 100644
--- a/awx/api/serializers.py
+++ b/awx/api/serializers.py
@@ -4687,10 +4687,10 @@ class ActivityStreamSerializer(BaseSerializer):
if fk not in summary_keys:
return
related_obj = getattr(obj, summary_keys[fk], None)
- summary_fields[get_type_for_model(related_obj)] = []
item = {}
fields = SUMMARIZABLE_FK_FIELDS[summary_keys[fk]]
if related_obj is not None:
+ summary_fields[get_type_for_model(related_obj)] = []
for field in fields:
fval = getattr(related_obj, field, None)
if fval is not None: