From 99f048dfe56f9b472644b6b26432cb3bb12c5c9a Mon Sep 17 00:00:00 2001 From: Matthew Jones Date: Mon, 2 Nov 2015 14:38:48 -0500 Subject: [PATCH] Add object_association for m2m relationships Now when displaying a m2m relationship change we'll show the related field mapping that changed. --- awx/api/serializers.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/awx/api/serializers.py b/awx/api/serializers.py index c53da8ada4..3157081193 100644 --- a/awx/api/serializers.py +++ b/awx/api/serializers.py @@ -2004,11 +2004,12 @@ class ScheduleSerializer(BaseSerializer): class ActivityStreamSerializer(BaseSerializer): changes = serializers.SerializerMethodField('get_changes') + object_association = serializers.SerializerMethodField('get_object_association') class Meta: model = ActivityStream fields = ('*', '-name', '-description', '-created', '-modified', - 'timestamp', 'operation', 'changes', 'object1', 'object2') + 'timestamp', 'operation', 'changes', 'object1', 'object2', 'object_association') def get_fields(self): ret = super(ActivityStreamSerializer, self).get_fields() @@ -2033,6 +2034,13 @@ class ActivityStreamSerializer(BaseSerializer): logger.warn("Error deserializing activity stream json changes") return {} + def get_object_association(self, obj): + try: + return obj.object_relationship_type.split(".")[-1].split("_")[1] + except: + pass + return "" + def get_related(self, obj): rel = {} if obj.actor is not None: