External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-07 17:37:37 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1632 from jaredevantabor/1507-error-message

Browse Source 
fixes error handling with groups service, sources service
This commit is contained in:
Jared Tabor
2018-05-02 14:22:45 -07:00
committed by GitHub
parent e792abbdc1 421293c8c5
commit 0715773987
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/ui/client/src/inventories-hosts/inventories/related/groups/add/groups-add.controller.js
View File

@@ -49,10 +49,10 @@ export default ['$state', '$stateParams', '$scope', 'GroupForm',
}; };
GroupsService.post(group).then(res => { GroupsService.post(group).then(res => {
if ($stateParams.group_id) { if ($stateParams.group_id && _.has(res, 'data')) {
return GroupsService.associateGroup(res.data, $stateParams.group_id) return GroupsService.associateGroup(res.data, $stateParams.group_id)
.then(() => $state.go('^', null, { reload: true })); .then(() => $state.go('^', null, { reload: true }));
} else { } else if(_.has(res, 'data.id')){
$state.go('^.edit', { group_id: res.data.id }, { reload: true }); $state.go('^.edit', { group_id: res.data.id }, { reload: true });
} }
}); });

4
awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups-add.controller.js
View File

@@ -45,10 +45,10 @@ export default ['$state', '$stateParams', '$scope', 'NestedGroupForm',
}; };
GroupsService.post(group).then(res => { GroupsService.post(group).then(res => {
if ($stateParams.group_id) { if ($stateParams.group_id && _.has(res, 'data')) {
return GroupsService.associateGroup(res.data, $stateParams.group_id) return GroupsService.associateGroup(res.data, $stateParams.group_id)
.then(() => $state.go('^', null, { reload: true })); .then(() => $state.go('^', null, { reload: true }));
} else { } else if(_.has(res, 'data.id')){
$state.go('^.edit', { group_id: res.data.id }, { reload: true }); $state.go('^.edit', { group_id: res.data.id }, { reload: true });
} }
}); });

6
awx/ui/client/src/inventories-hosts/inventories/related/sources/sources.service.js
View File

@@ -10,9 +10,9 @@ export default
url: function(){ url: function(){
return ''; return '';
}, },
error: function(data, status) { error: function(data) {
ProcessErrors($rootScope, data, status, null, { hdr: 'Error!', ProcessErrors($rootScope, data.data, data.status, null, { hdr: 'Error!',
msg: 'Call to ' + this.url + '. GET returned: ' + status }); msg: 'Call to ' + this.url + '. GET returned: ' + data.status });
}, },
success: function(data){ success: function(data){
return data; return data;

6
awx/ui/client/src/inventories-hosts/shared/groups.service.js
View File

@@ -10,9 +10,9 @@ export default
url: function(){ url: function(){
return ''; return '';
}, },
error: function(data, status) { error: function(data) {
ProcessErrors($rootScope, data, status, null, { hdr: 'Error!', ProcessErrors($rootScope, data.data, data.status, null, { hdr: 'Error!',
msg: 'Call to ' + this.url + '. GET returned: ' + status }); msg: 'Call to ' + this.url + '. GET returned: ' + data.status });
}, },
success: function(data){ success: function(data){
return data; return data;