zware/awx
1
0
Fork 0
mirror of https://github.com/ZwareBear/awx.git synced 2026-04-19 14:31:48 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6739 from mabashian/4556-delete-last-item-page

Browse Source 
Fixed deleting last resource on a page 404 error
This commit is contained in:
Michael Abashian
2017-06-27 10:08:59 -04:00
committed by GitHub
parent b3643f85db da0dfdbe13
commit e107bc6cc9
20 changed files with 187 additions and 63 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

@@ -74,10 +74,18 @@ export default ['$scope', 'Rest', 'CredentialList', 'Prompt',
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');
})