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

Fix a bug where we would treat the new model value like the old one when comparing activity stream changes

Browse Source
This commit is contained in:
Matthew Jones
2014-01-23 20:49:27 -05:00
parent 44d9d12e4d
commit 3d228b2955
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/api/serializers.py
View File

@@ -746,7 +746,7 @@ class PermissionSerializer(BaseSerializer):
model = Permission model = Permission
fields = BASE_FIELDS + ('user', 'team', 'project', 'inventory', fields = BASE_FIELDS + ('user', 'team', 'project', 'inventory',
'permission_type',) 'permission_type',)
def get_related(self, obj): def get_related(self, obj):
if obj is None: if obj is None:
return {} return {}

1
awx/main/utils.py
View File

@@ -264,6 +264,7 @@ def model_instance_diff(old, new, serializer_mapping=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)): if type(old_value) not in (bool, int, type(None)):
old_value = str(old_value) old_value = str(old_value)
if type(new_value) not in (bool, int, type(None)):
new_value = str(new_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: