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

Merge pull request #6087 from jakemcdermott/fix-6054

Browse Source 
Fix several ui_next bugs related to unexpected data types

Reviewed-by: Jake McDermott <yo@jakemcdermott.me>
             https://github.com/jakemcdermott
This commit is contained in:
softwarefactory-project-zuul[bot] 2020-02-26 20:21:06 +00:00 committed by GitHub
commit 88b7256e96
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
awx/ui_next/src/components/FormField/FormSubmitError.jsx
View File

@ -15,6 +15,8 @@ function FormSubmitError({ error }) {
setErrors(errorMessages);
if (errorMessages.__all__) {
setErrorMessage(errorMessages.__all__);
} else if (errorMessages.detail) {
setErrorMessage(errorMessages.detail);
} else {
setErrorMessage(null);
}

2
awx/ui_next/src/components/ResourceAccessList/ResourceAccessList.jsx
View File

@ -203,7 +203,7 @@ class ResourceAccessList extends React.Component {
onClick={this.handleAddOpen}
/>,
]
: null
: []
}
/>
)}

7
awx/ui_next/src/screens/Project/ProjectAdd/ProjectAdd.jsx
View File

@ -13,6 +13,13 @@ function ProjectAdd() {
if (values.scm_type === 'manual') {
values.scm_type = '';
}
if (!values.credential) {
// Depending on the permissions of the user submitting the form,
// the API might throw an unexpected error if our creation request
// has a zero-length string as its credential field. As a work-around,
// normalize falsey credential fields by deleting them.
delete values.credential;
}
setFormSubmitError(null);
try {
const {

7
awx/ui_next/src/screens/Project/ProjectEdit/ProjectEdit.jsx
View File

@ -13,6 +13,13 @@ function ProjectEdit({ project }) {
if (values.scm_type === 'manual') {
values.scm_type = '';
}
if (!values.credential) {
// Depending on the permissions of the user submitting the form,
// the API might throw an unexpected error if our creation request
// has a zero-length string as its credential field. As a work-around,
// normalize falsey credential fields by deleting them.
delete values.credential;
}
try {
const {
data: { id },