From 059345e330f8200e3d2b963873b7258716f4c79e Mon Sep 17 00:00:00 2001
From: AlanCoding <arominge@redhat.com>
Date: Fri, 11 Nov 2016 15:23:49 -0500
Subject: [PATCH] avoid reading notification configuration from
 already-serialized data

---
 awx/api/serializers.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/awx/api/serializers.py b/awx/api/serializers.py
index 986f5c8c1e..04aac02e0a 100644
--- a/awx/api/serializers.py
+++ b/awx/api/serializers.py
@@ -2680,9 +2680,10 @@ class NotificationTemplateSerializer(BaseSerializer):
     def to_representation(self, obj):
         ret = super(NotificationTemplateSerializer, self).to_representation(obj)
         for field in obj.notification_class.init_parameters:
-            if field in ret['notification_configuration'] and \
-               force_text(ret['notification_configuration'][field]).startswith('$encrypted$'):
-                ret['notification_configuration'][field] = '$encrypted$'
+            config = obj.notification_configuration
+            if field in config and force_text(config[field]).startswith('$encrypted$'):
+                config[field] = '$encrypted$'
+        ret['notification_configuration'] = config
         return ret
 
     def get_related(self, obj):