From 572c1765cd899cb40f21712abb9f5ceececc60d8 Mon Sep 17 00:00:00 2001 From: Matthew Jones Date: Mon, 8 Dec 2014 16:45:43 -0500 Subject: [PATCH] Different strategy on the inventory script serializer, this should work much better --- awx/api/serializers.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/awx/api/serializers.py b/awx/api/serializers.py index 240fed3232..bd825f65f0 100644 --- a/awx/api/serializers.py +++ b/awx/api/serializers.py @@ -975,17 +975,18 @@ class GroupVariableDataSerializer(BaseVariableDataSerializer): class CustomInventoryScriptSerializer(BaseSerializer): - script = serializers.SerializerMethodField('get_script') - class Meta: model = CustomInventoryScript fields = ('*', "script", "organization") - def get_script(self, obj): + def to_native(self, obj): + ret = super(CustomInventoryScriptSerializer, self).to_native(obj) + if obj is None: + return ret request = self.context.get('request', None) - if request is not None and request.user is not None and request.user.is_superuser: - return obj.script - return None + if request is not None and request.user is not None and not request.user.is_superuser: + ret['script'] = None + return ret class InventorySourceOptionsSerializer(BaseSerializer):