External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-07 17:37:37 -02:30
Code Issues Packages Projects Releases Wiki Activity

Fix AC-648... make sure the changes field is not represented using nested json

Browse Source
This commit is contained in:
Matthew Jones
2013-11-19 10:45:07 -05:00
parent 94bbab566b
commit 7fda453720
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
awx/api/serializers.py
View File

@@ -969,11 +969,18 @@ class JobEventSerializer(BaseSerializer):
class ActivityStreamSerializer(BaseSerializer): class ActivityStreamSerializer(BaseSerializer):
changes = serializers.SerializerMethodField('get_changes')
class Meta: class Meta:
model = ActivityStream model = ActivityStream
fields = ('id', 'url', 'related', 'summary_fields', 'timestamp', 'operation', 'changes', fields = ('id', 'url', 'related', 'summary_fields', 'timestamp', 'operation', 'changes',
'object1_id', 'object1', 'object1_type', 'object2_id', 'object2', 'object2_type', 'object_relationship_type') 'object1_id', 'object1', 'object1_type', 'object2_id', 'object2', 'object2_type', 'object_relationship_type')
def get_changes(self, obj):
if obj is None:
return {}
return json.loads(obj.changes)
def get_related(self, obj): def get_related(self, obj):
if obj is None: if obj is None:
return {} return {}