External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-23 11:55:04 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3240 from jaredevantabor/email_notification

Browse Source 
Making the username and password fields optional
This commit is contained in:
Jared Tabor
2016-08-12 07:54:27 -07:00
committed by GitHub
parent 5445940e84 d8c713d5ef
commit a7a6aaa8ac
4 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
awx/ui/client/src/notifications/add/add.controller.js
View File

@@ -149,6 +149,12 @@ export default
if(field.type === 'number'){ if(field.type === 'number'){
$scope[i] = Number($scope[i]); $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]; return $scope[i];
} }

6
awx/ui/client/src/notifications/edit/edit.controller.js
View File

@@ -223,6 +223,12 @@ export default
if(field.type === 'number'){ if(field.type === 'number'){
$scope[i] = Number($scope[i]); $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]; return $scope[i];
} }

4
awx/ui/client/src/notifications/notificationTemplates.form.js
View File

@@ -59,10 +59,6 @@ export default function() {
username: { username: {
label: 'Username', label: 'Username',
type: 'text', type: 'text',
awRequiredWhen: {
reqExpression: "email_required",
init: "false"
},
ngShow: "notification_type.value == 'email' ", ngShow: "notification_type.value == 'email' ",
subForm: 'typeSubForm' subForm: 'typeSubForm'
}, },

2
awx/ui/client/src/notifications/shared/type-change.service.js
View File

@@ -28,7 +28,7 @@ function () {
obj.passwordLabel = ' Password'; obj.passwordLabel = ' Password';
obj.email_required = true; obj.email_required = true;
obj.port_required = true; obj.port_required = true;
obj.password_required = true; obj.password_required = false;
break; break;
case 'slack': case 'slack':
obj.tokenLabel =' Token'; obj.tokenLabel =' Token';