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

Merge pull request #2765 from jaredevantabor/fix-2748

Browse Source 
Improves error handling of applications page form
This commit is contained in:
Jared Tabor 2018-08-07 11:07:32 -07:00 committed by GitHub
commit d1f37ad1af
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
awx/ui/client/features/applications/index.js
View File

@ -12,7 +12,15 @@ const listTemplate = require('~features/applications/list-applications.view.html
const indexTemplate = require('~features/applications/index.view.html');
const userListTemplate = require('~features/applications/list-applications-users.view.html');
function ApplicationsDetailResolve ($q, $stateParams, Me, Application, Organization) {
function ApplicationsDetailResolve (
$q,
$stateParams,
Me,
Application,
Organization,
ProcessErrors,
strings
) {
const id = $stateParams.application_id;
const promises = {
@ -42,6 +50,13 @@ function ApplicationsDetailResolve ($q, $stateParams, Me, Application, Organizat
return models;
});
})
.catch(({ data, status, config }) => {
ProcessErrors(null, data, status, null, {
hdr: strings.get('error.HEADER'),
msg: strings.get('error.CALL', { path: `${config.url}`, status })
});
return $q.reject();
});
}
@ -50,7 +65,9 @@ ApplicationsDetailResolve.$inject = [
'$stateParams',
'MeModel',
'ApplicationModel',
'OrganizationModel'
'OrganizationModel',
'ProcessErrors',
'ApplicationsStrings'
];
function ApplicationsRun ($stateExtender, strings) {

6
awx/ui/client/lib/components/form/form.directive.js
View File

@ -114,6 +114,12 @@ function AtFormController (eventService, strings) {
if (typeof err.data === 'object') {
message = JSON.stringify(err.data);
} if (_.has(err, 'data.__all__')) {
if (typeof err.data.__all__ === 'object' && Array.isArray(err.data.__all__)) {
message = JSON.stringify(err.data.__all__[0]);
} else {
message = JSON.stringify(err.data.__all__);
}
} else {
message = err.data;
}