zware/awx
1
0
Fork 0
mirror of https://github.com/ZwareBear/awx.git synced 2026-04-09 01:21:49 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fixed deleting last resource on a page 404 error

Browse Source
This commit is contained in:
Michael Abashian
2017-06-26 16:22:54 -04:00
parent 6ef7b88675
commit da0dfdbe13
20 changed files with 188 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
awx/ui/client/src/credentials/list/credentials-list.controller.js
View File

@@ -76,10 +76,18 @@ export default ['$scope', 'Rest', 'CredentialList', 'Prompt', 'ClearScope',
Rest.setUrl(url);
Rest.destroy()
.success(function() {
let reloadListStateParams = null;
if($scope.credentials.length === 1 && $state.params.credential_search && !_.isEmpty($state.params.credential_search.page) && $state.params.credential_search.page !== '1') {
reloadListStateParams = _.cloneDeep($state.params);
reloadListStateParams.credential_search.page = (parseInt(reloadListStateParams.credential_search.page)-1).toString();
}
if (parseInt($state.params.credential_id) === id) {
$state.go("^", null, { reload: true });
$state.go("^", reloadListStateParams, { reload: true });
} else {
$state.go('.', null, {reload: true});
$state.go('.', reloadListStateParams, {reload: true});
}
Wait('stop');
})