From d8c713d5efa11dc825fc942dfc9ce79c2bb8eb74 Mon Sep 17 00:00:00 2001
From: Jared Tabor <jtabor@ansible.com>
Date: Wed, 10 Aug 2016 14:08:33 -0700
Subject: [PATCH] Making the username and password fields optional

for email notifications
---
 awx/ui/client/src/notifications/add/add.controller.js       | 6 ++++++
 awx/ui/client/src/notifications/edit/edit.controller.js     | 6 ++++++
 .../client/src/notifications/notificationTemplates.form.js  | 4 ----
 .../client/src/notifications/shared/type-change.service.js  | 2 +-
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/awx/ui/client/src/notifications/add/add.controller.js b/awx/ui/client/src/notifications/add/add.controller.js
index 148940e8a1..0b58f2e257 100644
--- a/awx/ui/client/src/notifications/add/add.controller.js
+++ b/awx/ui/client/src/notifications/add/add.controller.js
@@ -149,6 +149,12 @@ export default
                     if(field.type === 'number'){
                         $scope[i] = Number($scope[i]);
                     }
+                    if(field.name === "username" && $scope.notification_type.value === "email" && value === null){
+                        $scope[i] = "";
+                    }
+                    if(field.type === 'sensitive' && value === null){
+                        $scope[i] = "";
+                    }
                     return $scope[i];
                 }
 
diff --git a/awx/ui/client/src/notifications/edit/edit.controller.js b/awx/ui/client/src/notifications/edit/edit.controller.js
index 4e0bc35772..44c50a71ce 100644
--- a/awx/ui/client/src/notifications/edit/edit.controller.js
+++ b/awx/ui/client/src/notifications/edit/edit.controller.js
@@ -223,6 +223,12 @@ export default
                     if(field.type === 'number'){
                         $scope[i] = Number($scope[i]);
                     }
+                    if(field.name === "username" && $scope.notification_type.value === "email" && value === null){
+                        $scope[i] = "";
+                    }
+                    if(field.type === 'sensitive' && value === null){
+                        $scope[i] = "";
+                    }
                     return $scope[i];
                 }
 
diff --git a/awx/ui/client/src/notifications/notificationTemplates.form.js b/awx/ui/client/src/notifications/notificationTemplates.form.js
index d748ab96e4..cd0ff9d945 100644
--- a/awx/ui/client/src/notifications/notificationTemplates.form.js
+++ b/awx/ui/client/src/notifications/notificationTemplates.form.js
@@ -59,10 +59,6 @@ export default function() {
             username: {
                 label: 'Username',
                 type: 'text',
-                awRequiredWhen: {
-                    reqExpression: "email_required",
-                    init: "false"
-                },
                 ngShow: "notification_type.value == 'email' ",
                 subForm: 'typeSubForm'
             },
diff --git a/awx/ui/client/src/notifications/shared/type-change.service.js b/awx/ui/client/src/notifications/shared/type-change.service.js
index e7d63e51f5..0827e88b34 100644
--- a/awx/ui/client/src/notifications/shared/type-change.service.js
+++ b/awx/ui/client/src/notifications/shared/type-change.service.js
@@ -28,7 +28,7 @@ function () {
                     obj.passwordLabel = ' Password';
                     obj.email_required = true;
                     obj.port_required = true;
-                    obj.password_required = true;
+                    obj.password_required = false;
                     break;
                 case 'slack':
                     obj.tokenLabel =' Token';