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

Merge pull request #4704 from keithjgrant/4522-save-nt-after-fixing-form-errors

Browse Source 
Fix Notification Template form validation of headers field

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
This commit is contained in:
softwarefactory-project-zuul[bot]
2019-09-10 19:56:33 +00:00
committed by GitHub
parent a9a1c6eb6d 8192b79b1f
commit 7646185e2c
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -105,7 +105,7 @@ export default ['Rest', 'Wait', 'NotificationsFormObject',
$scope.$watch('headers', function validate_headers(str) { $scope.$watch('headers', function validate_headers(str) {
try { try {
let headers = JSON.parse(str); const headers = typeof str === 'string' ? JSON.parse(str) : str;
if (_.isObject(headers) && !_.isArray(headers)) { if (_.isObject(headers) && !_.isArray(headers)) {
let valid = true; let valid = true;
for (let k in headers) { for (let k in headers) {

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

@@ -189,7 +189,7 @@ export default ['Rest', 'Wait',
$scope.$watch('headers', function validate_headers(str) { $scope.$watch('headers', function validate_headers(str) {
try { try {
let headers = JSON.parse(str); const headers = typeof str === 'string' ? JSON.parse(str) : str;
if (_.isObject(headers) && !_.isArray(headers)) { if (_.isObject(headers) && !_.isArray(headers)) {
let valid = true; let valid = true;
for (let k in headers) { for (let k in headers) {