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

update validation when input source is set

Browse Source
This commit is contained in:
Jake McDermott
2019-03-25 20:02:13 -04:00
parent f0f4f487fb
commit aa4575c92e
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
awx/ui/client/features/credentials/add-edit-credentials.controller.js
View File

@@ -128,7 +128,7 @@ function AddEditCredentialsController (
let gceFileInputPreEditValues; let gceFileInputPreEditValues;
vm.form.inputs = { vm.form.inputs = {
_get ({ getSubmitData }) { _get ({ getSubmitData, check }) {
const apiConfig = ConfigService.get(); const apiConfig = ConfigService.get();
credentialType.mergeInputProperties(); credentialType.mergeInputProperties();
@@ -152,6 +152,7 @@ function AddEditCredentialsController (
} }
vm.isTestable = (isEditable && credentialType.get('kind') === 'external'); vm.isTestable = (isEditable && credentialType.get('kind') === 'external');
vm.getSubmitData = getSubmitData; vm.getSubmitData = getSubmitData;
vm.checkForm = check;
return fields; return fields;
}, },
@@ -345,7 +346,9 @@ function AddEditCredentialsController (
// We've linked this field to a credential, so display value as a credential tag // We've linked this field to a credential, so display value as a credential tag
vm.form[field]._value = ''; vm.form[field]._value = '';
vm.form[field]._tagValue = credentialName; vm.form[field]._tagValue = credentialName;
vm.form[field]._isValid = true;
vm.form[field].asTag = true; vm.form[field].asTag = true;
vm.checkForm();
}; };
vm.onInputSourceTabSelect = (name) => { vm.onInputSourceTabSelect = (name) => {

4
awx/ui/client/lib/components/input/base.controller.js
View File

@@ -51,6 +51,10 @@ function BaseInputController (strings) {
let isValid = true; let isValid = true;
let message = ''; let message = '';
if (scope.state.asTag) {
return (isValid, message);
}
if (scope.state._value || scope.state._displayValue) { if (scope.state._value || scope.state._displayValue) {
scope.state._touched = true; scope.state._touched = true;
} }