From 0d2f92c364a8ab3390e263cc7a3e7f9d441bf10e Mon Sep 17 00:00:00 2001 From: adamscmRH Date: Tue, 17 Apr 2018 12:02:35 -0400 Subject: [PATCH] Fix app json error --- awx/api/serializers.py | 2 +- awx/main/models/activity_stream.py | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/awx/api/serializers.py b/awx/api/serializers.py index ee4625da3e..c34520ac30 100644 --- a/awx/api/serializers.py +++ b/awx/api/serializers.py @@ -4651,7 +4651,7 @@ class ActivityStreamSerializer(BaseSerializer): ('workflow_job_template_node', ('id', 'unified_job_template_id')), ('label', ('id', 'name', 'organization_id')), ('notification', ('id', 'status', 'notification_type', 'notification_template_id')), - ('o_auth2_access_token', ('id', 'user_id', 'description', 'application', 'scope')), + ('o_auth2_access_token', ('id', 'user_id', 'description', 'application_id', 'scope')), ('o_auth2_application', ('id', 'name', 'description')), ('credential_type', ('id', 'name', 'description', 'kind', 'managed_by_tower')), ('ad_hoc_command', ('id', 'name', 'status', 'limit')) diff --git a/awx/main/models/activity_stream.py b/awx/main/models/activity_stream.py index d317208aa5..45d8cbea07 100644 --- a/awx/main/models/activity_stream.py +++ b/awx/main/models/activity_stream.py @@ -66,7 +66,6 @@ class ActivityStream(models.Model): label = models.ManyToManyField("Label", blank=True) role = models.ManyToManyField("Role", blank=True) instance_group = models.ManyToManyField("InstanceGroup", blank=True) - o_auth2_application = models.ManyToManyField("OAuth2Application", blank=True) o_auth2_access_token = models.ManyToManyField("OAuth2AccessToken", blank=True)