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

Implement AC-911, use the proper type relative to json serialization for the stored changes dict on an activity stream object

Browse Source
This commit is contained in:
Matthew Jones
2014-01-23 16:19:14 -05:00
parent 2712643c62
commit bb6c34f4a4
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
awx/main/utils.py
View File

@@ -258,10 +258,13 @@ def model_instance_diff(old, new, serializer_mapping=None):
allowed_fields = [x.name for x in new._meta.fields] allowed_fields = [x.name for x in new._meta.fields]
for field in allowed_fields: for field in allowed_fields:
old_value = str(getattr(old, field, None)) old_value = getattr(old, field, None)
new_value = str(getattr(new, field, None)) new_value = getattr(new, field, None)
if old_value != new_value and field not in Credential.PASSWORD_FIELDS: if old_value != new_value and field not in Credential.PASSWORD_FIELDS:
if type(old_value) not in (bool, int, type(None)):
old_value = str(old_value)
new_value = str(new_value)
diff[field] = (old_value, new_value) diff[field] = (old_value, new_value)
elif old_value != new_value and field in Credential.PASSWORD_FIELDS: elif old_value != new_value and field in Credential.PASSWORD_FIELDS:
diff[field] = ("hidden", "hidden") diff[field] = ("hidden", "hidden")
@@ -288,7 +291,11 @@ def model_to_dict(obj, serializer_mapping=None):
if field.name not in allowed_fields: if field.name not in allowed_fields:
continue continue
if field.name not in Credential.PASSWORD_FIELDS: if field.name not in Credential.PASSWORD_FIELDS:
attr_d[field.name] = str(getattr(obj, field.name, None)) field_val = getattr(obj, field.name, None)
if type(field_val) not in (bool, int, type(None)):
attr_d[field.name] = str(field_val)
else:
attr_d[field.name] = field_val
else: else:
attr_d[field.name] = "hidden" attr_d[field.name] = "hidden"
return attr_d return attr_d