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

Add more verification when deserializing json changes field on activity stream

Browse Source
This commit is contained in:
Matthew Jones
2013-11-19 10:48:05 -05:00
parent 7fda453720
commit 66d6e2fe43
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
awx/api/serializers.py
View File

@@ -979,7 +979,12 @@ class ActivityStreamSerializer(BaseSerializer):
def get_changes(self, obj): def get_changes(self, obj):
if obj is None: if obj is None:
return {} return {}
return json.loads(obj.changes) try:
d_changes = json.loads(obj.changes)
return d_changes
except Exception, e:
logger.warn("Error deserializing activity stream json changes")
return {}
def get_related(self, obj): def get_related(self, obj):
if obj is None: if obj is None: