External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-17 22:37:41 -02:30
Code Issues Packages Projects Releases Wiki Activity

Revert required org on notification templates

Browse Source 
This reverts the validation of a required Organization on the
Notification Template.   After discussion with jlaska and jladd, I think
this can behave fine in this situation.   It's more like a Credential
then where without an Organization the NT only becomes available to
Super Users and the creator of the NT.
This commit is contained in:
Matthew Jones
2016-07-13 11:10:18 -04:00
parent e9a0f41152
commit e9afee6149
1 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
awx/api/serializers.py
View File

@@ -2429,16 +2429,8 @@ class NotificationTemplateSerializer(BaseSerializer):
notification_type = self.instance.notification_type notification_type = self.instance.notification_type
else: else:
notification_type = None notification_type = None
if 'organization' in attrs:
organization = attrs['organization']
elif self.instance:
organization = self.instance.organization
else:
organization = None
if not notification_type: if not notification_type:
raise serializers.ValidationError('Missing required fields for Notification Configuration: notification_type') raise serializers.ValidationError('Missing required fields for Notification Configuration: notification_type')
if not organization:
raise serializers.ValidationError("Missing 'organization' from required fields")
notification_class = NotificationTemplate.CLASS_FOR_NOTIFICATION_TYPE[notification_type] notification_class = NotificationTemplate.CLASS_FOR_NOTIFICATION_TYPE[notification_type]
missing_fields = [] missing_fields = []