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

Merge pull request #4630 from chrismeyersfsu/fix-4368_2

Browse Source 
handle reload when deleting org card under edit
This commit is contained in:
Chris Meyers
2017-01-10 13:00:18 -05:00
committed by GitHub
parent dca57b27e8 7f6551ec20
commit 6c4df56223
1 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
awx/ui/client/src/organizations/list/organizations-list.controller.js
View File

@@ -127,6 +127,16 @@ export default ['$stateParams', '$scope', '$rootScope', '$location',
}); });
}; };
function isDeletedOrganizationBeingEdited(deleted_organization_id, editing_organization_id) {
if (editing_organization_id === undefined) {
return false;
}
if (deleted_organization_id === editing_organization_id) {
return true;
}
return false;
}
$scope.deleteOrganization = function(id, name) { $scope.deleteOrganization = function(id, name) {
var action = function() { var action = function() {
@@ -137,7 +147,11 @@ export default ['$stateParams', '$scope', '$rootScope', '$location',
Rest.destroy() Rest.destroy()
.success(function() { .success(function() {
Wait('stop'); Wait('stop');
$state.reload('organizations'); if (isDeletedOrganizationBeingEdited(id, parseInt($stateParams.organization_id)) === true) {
$state.go('^', null, { reload: true });
} else {
$state.reload('organizations');
}
}) })
.error(function(data, status) { .error(function(data, status) {
ProcessErrors($scope, data, status, null, { ProcessErrors($scope, data, status, null, {