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

fix issue with interior scope declaration eslint error

Browse Source
This commit is contained in:
John Mitchell
2019-08-05 15:04:53 -04:00
committed by AlanCoding
parent dc5d696238
commit 79a1dbc5a0
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
awx/ui/client/src/shared/Utilities.js
View File

@@ -183,8 +183,8 @@ angular.module('Utilities', ['RestServices', 'Utilities'])
} else if (form) { //if no error code is detected it begins to loop through to see where the api threw an error } else if (form) { //if no error code is detected it begins to loop through to see where the api threw an error
fieldErrors = false; fieldErrors = false;
const addApiErrors = (data, field, fld) => { const addApiErrors = (field, fld) => {
if (data && field.tab) { if (data[fld] && field.tab) {
// If the form is part of a tab group, activate the tab // If the form is part of a tab group, activate the tab
$('#' + form.name + "_tabs a[href=\"#" + field.tab + '"]').tab('show'); $('#' + form.name + "_tabs a[href=\"#" + field.tab + '"]').tab('show');
} }
@@ -198,17 +198,17 @@ angular.module('Utilities', ['RestServices', 'Utilities'])
} }
} }
if (field.sourceModel) { if (field.sourceModel) {
if (data) { if (data[fld]) {
scope[field.sourceModel + '_' + field.sourceField + '_api_error'] = scope[field.sourceModel + '_' + field.sourceField + '_api_error'] =
data[0]; data[fld][0];
//scope[form.name + '_form'][form.fields[field].sourceModel + '_' + form.fields[field].sourceField].$setValidity('apiError', false); //scope[form.name + '_form'][form.fields[field].sourceModel + '_' + form.fields[field].sourceField].$setValidity('apiError', false);
$('[name="' + field.sourceModel + '_' + field.sourceField + '"]').addClass('ng-invalid'); $('[name="' + field.sourceModel + '_' + field.sourceField + '"]').addClass('ng-invalid');
$('[name="' + field.sourceModel + '_' + field.sourceField + '"]').ScrollTo({ "onlyIfOutside": true, "offsetTop": 100 }); $('[name="' + field.sourceModel + '_' + field.sourceField + '"]').ScrollTo({ "onlyIfOutside": true, "offsetTop": 100 });
fieldErrors = true; fieldErrors = true;
} }
} else { } else {
if (data) { if (data[fld]) {
scope[fld + '_api_error'] = data[0]; scope[fld + '_api_error'] = data[fld][0];
$('[name="' + fld + '"]').addClass('ng-invalid'); $('[name="' + fld + '"]').addClass('ng-invalid');
$('label[for="' + fld + '"] span').addClass('error-color'); $('label[for="' + fld + '"] span').addClass('error-color');
$('html, body').animate({scrollTop: $('[name="' + fld + '"]').offset().top}, 0); $('html, body').animate({scrollTop: $('[name="' + fld + '"]').offset().top}, 0);
@@ -223,10 +223,10 @@ angular.module('Utilities', ['RestServices', 'Utilities'])
for (field in form.fields) { for (field in form.fields) {
if (form.fields[field].type === "checkbox_group") { if (form.fields[field].type === "checkbox_group") {
form.fields[field].fields.forEach(fld => { form.fields[field].fields.forEach(fld => {
addApiErrors(data[fld.name], fld, fld.name) addApiErrors(fld, fld.name);
}); });
} else { } else {
addApiErrors(data[field], form.fields[field], field); addApiErrors(form.fields[field], field);
} }
} }
if (defaultMsg) { if (defaultMsg) {