shaba/awx
1
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2024-10-31 23:51:09 +03:00
Code Releases Activity

Fix credential create/edit using type with no fields

Browse Source
This commit is contained in:
gconsidine 2017-08-11 16:55:45 -04:00
parent 9b27bc193f
commit 4a37f049b0
3 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
awx/ui/client/lib/components/input/group.directive.js
View File

@ -54,16 +54,18 @@ function AtInputGroupController ($scope, $compile) {
vm.createComponentConfigs = inputs => {
let group = [];
inputs.forEach((input, i) => {
input = Object.assign(input, vm.getComponentType(input));
if (inputs) {
inputs.forEach((input, i) => {
input = Object.assign(input, vm.getComponentType(input));
group.push(Object.assign({
_element: vm.createComponent(input, i),
_key: 'inputs',
_group: true,
_groupIndex: i
}, input));
});
group.push(Object.assign({
_element: vm.createComponent(input, i),
_key: 'inputs',
_group: true,
_groupIndex: i
}, input));
});
}
return group;
};

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

@ -26,6 +26,10 @@ function createFormSchema (method, config) {
}
function assignInputGroupValues (inputs) {
if (!inputs) {
return [];
}
return inputs.map(input => {
let value = this.get(`inputs.${input.id}`);

4
awx/ui/client/lib/models/CredentialType.js
View File

@ -15,6 +15,10 @@ function categorizeByKind () {
}
function mergeInputProperties () {
if (!this.has('inputs.fields')) {
return;
}
let required = this.get('inputs.required');
return this.get('inputs.fields').map((field, i) => {