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

Fixed bug deleting last team/user permission on page

Browse Source
This commit is contained in:
mabashian
2018-05-09 14:16:46 -04:00
parent 72f982ab55
commit eccf3029b4
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
awx/ui/client/src/access/permissions-list.controller.js
View File

@@ -14,6 +14,17 @@ export default ['$scope', 'ListDefinition', 'Dataset', 'Wait', 'Rest', 'ProcessE
$scope[`${list.iterator}s`] = $scope[`${list.iterator}_dataset`].results; $scope[`${list.iterator}s`] = $scope[`${list.iterator}_dataset`].results;
} }
let reloadAfterDelete = () => {
let reloadListStateParams = null;
if($scope.permissions.length === 1 && $state.params.permission_search && _.has($state, 'params.permission_search.page') && parseInt($state.params.permission_search.page).toString() !== '1') {
reloadListStateParams = _.cloneDeep($state.params);
reloadListStateParams.permission_search.page = (parseInt(reloadListStateParams.permission_search.page)-1).toString();
}
$state.go('.', reloadListStateParams, {reload: true});
};
$scope.deletePermissionFromUser = function(userId, userName, roleName, roleType, url) { $scope.deletePermissionFromUser = function(userId, userName, roleName, roleType, url) {
var action = function() { var action = function() {
@@ -23,7 +34,7 @@ export default ['$scope', 'ListDefinition', 'Dataset', 'Wait', 'Rest', 'ProcessE
Rest.post({ "disassociate": true, "id": Number(userId) }) Rest.post({ "disassociate": true, "id": Number(userId) })
.then(() => { .then(() => {
Wait('stop'); Wait('stop');
$state.go('.', null, {reload: true}); reloadAfterDelete();
}) })
.catch(({data, status}) => { .catch(({data, status}) => {
ProcessErrors($scope, data, status, null, { ProcessErrors($scope, data, status, null, {
@@ -56,7 +67,7 @@ export default ['$scope', 'ListDefinition', 'Dataset', 'Wait', 'Rest', 'ProcessE
Rest.post({ "disassociate": true, "id": teamId }) Rest.post({ "disassociate": true, "id": teamId })
.then(() => { .then(() => {
Wait('stop'); Wait('stop');
$state.go('.', null, {reload: true}); reloadAfterDelete();
}) })
.catch(({data, status}) => { .catch(({data, status}) => {
ProcessErrors($scope, data, status, null, { ProcessErrors($scope, data, status, null, {