diff --git a/awx/api/serializers.py b/awx/api/serializers.py index 0f2ffb2d0d..91a8983cb4 100644 --- a/awx/api/serializers.py +++ b/awx/api/serializers.py @@ -746,7 +746,7 @@ class PermissionSerializer(BaseSerializer): model = Permission fields = BASE_FIELDS + ('user', 'team', 'project', 'inventory', 'permission_type',) - + def get_related(self, obj): if obj is None: return {} diff --git a/awx/main/utils.py b/awx/main/utils.py index 618e57eb21..82b2eef804 100644 --- a/awx/main/utils.py +++ b/awx/main/utils.py @@ -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 type(old_value) not in (bool, int, type(None)): old_value = str(old_value) + if type(new_value) not in (bool, int, type(None)): new_value = str(new_value) diff[field] = (old_value, new_value) elif old_value != new_value and field in Credential.PASSWORD_FIELDS: