From 3e0ed4c1a1a7109c8a9372a49d8d16a8fd77394a Mon Sep 17 00:00:00 2001 From: Matthew Jones Date: Wed, 6 Jul 2016 16:35:59 -0400 Subject: [PATCH] Fix up organization default exposed by unit test --- awx/api/serializers.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/awx/api/serializers.py b/awx/api/serializers.py index c122351a32..9ce7aee670 100644 --- a/awx/api/serializers.py +++ b/awx/api/serializers.py @@ -2427,9 +2427,13 @@ class NotificationTemplateSerializer(BaseSerializer): notification_type = attrs['notification_type'] elif self.instance: notification_type = self.instance.notification_type + if 'organization' in attrs: + organization = attrs['organization'] + elif self.instance: + organization = self.instance.organization if not notification_type: raise serializers.ValidationError('Missing required fields for Notification Configuration: notification_type') - if 'organization' not in attrs: + if not organization: raise serializers.ValidationError("Missing 'organization' from required fields") notification_class = NotificationTemplate.CLASS_FOR_NOTIFICATION_TYPE[notification_type]