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

Merge pull request #7537 from jakemcdermott/fix-7483

Browse Source 
Fix custom credential field validation

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
This commit is contained in:
softwarefactory-project-zuul[bot] 2020-07-07 19:02:53 +00:00 committed by GitHub
commit b9fb9389e6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 39 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -53,16 +53,19 @@ function AddEditCredentialsController (
vm.form.disabled = !isEditable;
}
vm.form.organization._disabled = !isOrgEditableByUser;
vm.form._organization._disabled = !isOrgEditableByUser;
// Only exists for permissions compatibility
$scope.credential_obj = credential.get();
vm.form.organization._resource = 'organization';
vm.form.organization._model = organization;
vm.form.organization._route = 'credentials.edit.organization';
vm.form.organization._value = credential.get('summary_fields.organization.id');
vm.form.organization._displayValue = credential.get('summary_fields.organization.name');
vm.form.organization._placeholder = strings.get('inputs.ORGANIZATION_PLACEHOLDER');
// Custom credentials can have input fields named 'name', 'organization',
// 'description', etc. Underscore these variables to make collisions
// less likely to occur.
vm.form._organization._resource = 'organization';
vm.form._organization._model = organization;
vm.form._organization._route = 'credentials.edit.organization';
vm.form._organization._value = credential.get('summary_fields.organization.id');
vm.form._organization._displayValue = credential.get('summary_fields.organization.name');
vm.form._organization._placeholder = strings.get('inputs.ORGANIZATION_PLACEHOLDER');
vm.form.credential_type._resource = 'credential_type';
vm.form.credential_type._model = credentialType;
@ -98,10 +101,10 @@ function AddEditCredentialsController (
vm.form._formName = 'credential';
vm.form.disabled = !credential.isCreatable();
vm.form.organization._resource = 'organization';
vm.form.organization._route = 'credentials.add.organization';
vm.form.organization._model = organization;
vm.form.organization._placeholder = strings.get('inputs.ORGANIZATION_PLACEHOLDER');
vm.form._organization._resource = 'organization';
vm.form._organization._route = 'credentials.add.organization';
vm.form._organization._model = organization;
vm.form._organization._placeholder = strings.get('inputs.ORGANIZATION_PLACEHOLDER');
vm.form.credential_type._resource = 'credential_type';
vm.form.credential_type._route = 'credentials.add.credentialType';
@ -112,7 +115,7 @@ function AddEditCredentialsController (
$scope.$watch('organization', () => {
if ($scope.organization) {
vm.form.organization._idFromModal = $scope.organization;
vm.form._organization._idFromModal = $scope.organization;
}
});

6
awx/ui/client/features/credentials/add-edit-credentials.view.html
View File

@ -10,9 +10,9 @@
<at-panel-body>
<at-form state="vm.form" autocomplete="off" id="credential_form">
<at-input-text col="4" tab="1" state="vm.form.name" id="credential_name_group"></at-input-text>
<at-input-text col="4" tab="2" state="vm.form.description" id="credential_description_group"></at-input-text>
<at-input-lookup col="4" tab="3" state="vm.form.organization" id="credential_organization_group"></at-input-lookup>
<at-input-text col="4" tab="1" state="vm.form._name" id="credential_name_group"></at-input-text>
<at-input-text col="4" tab="2" state="vm.form._description" id="credential_description_group"></at-input-text>
<at-input-lookup col="4" tab="3" state="vm.form._organization" id="credential_organization_group"></at-input-lookup>
<at-divider></at-divider>

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

@ -12,7 +12,13 @@ function BaseInputController (strings) {
scope.state._touched = false;
scope.state._required = scope.state.required || false;
scope.state._isValid = scope.state._isValid || false;
if (scope.state.type === 'boolean') {
scope.state._isValid = scope.state._isValid || true;
} else {
scope.state._isValid = scope.state._isValid || false;
}
scope.state._disabled = scope.state._disabled || false;
scope.state._activeModel = scope.state._activeModel || '_value';
@ -59,6 +65,10 @@ function BaseInputController (strings) {
scope.state._touched = true;
}
if (scope.state.type === 'boolean') {
return { isValid, message };
}
if (scope.state._required && (!scope.state._value || !scope.state._value[0]) &&
!scope.state._displayValue) {
isValid = false;

10
awx/ui/client/lib/models/Credential.js
View File

@ -27,6 +27,16 @@ function createFormSchema (method, config) {
}
});
// Custom credentials can have input fields named 'name', 'organization',
// 'description', etc. Underscore these variables to make collisions
// less likely to occur.
schema._name = schema.name;
schema._organization = schema.organization;
schema._description = schema.description;
delete schema.name;
delete schema.organization;
delete schema.description;
return schema;
}