mirror of
https://github.com/ansible/awx.git
synced 2024-11-02 09:51:09 +03:00
Found an issue when deleting multipkle credentials. First delete worked fine. Second delete left the overlay hiding the page. Seems the .off() option on bootstrap modal no longer works as expected.
This commit is contained in:
parent
cda1a8bd10
commit
10e85b50b1
@ -39,11 +39,11 @@ function CredentialsList($scope, $rootScope, $location, $log, $routeParams, Rest
|
||||
$scope.removePostRefresh();
|
||||
}
|
||||
$scope.removePostRefresh = $scope.$on('PostRefresh', function () {
|
||||
// Cleanup after a delete
|
||||
var i, j;
|
||||
|
||||
// Cleanup after a delete
|
||||
Wait('stop');
|
||||
$('#prompt-modal').off();
|
||||
$('#prompt-modal').modal('hide');
|
||||
|
||||
list.fields.kind.searchOptions = $scope.credential_kind_options;
|
||||
|
||||
|
@ -88,7 +88,7 @@ function InventoriesList($scope, $rootScope, $location, $log, $routeParams, Rest
|
||||
$scope.removePostRefresh = $scope.$on('PostRefresh', function () {
|
||||
//If we got here by deleting an inventory, stop the spinner and cleanup events
|
||||
Wait('stop');
|
||||
$('#prompt-modal').off();
|
||||
$('#prompt-modal').modal('hide');
|
||||
|
||||
for (var i = 0; i < $scope.inventories.length; i++) {
|
||||
|
||||
|
@ -31,7 +31,7 @@ function JobTemplatesList($scope, $rootScope, $location, $log, $routeParams, Res
|
||||
$scope.removePostRefresh = $scope.$on('PostRefresh', function () {
|
||||
// Cleanup after a delete
|
||||
Wait('stop');
|
||||
$('#prompt-modal').off();
|
||||
$('#prompt-modal').modal('hide');
|
||||
});
|
||||
|
||||
SearchInit({
|
||||
|
@ -37,7 +37,7 @@ function OrganizationsList($routeParams, $scope, $rootScope, $location, $log, Re
|
||||
$scope.removePostRefresh = $scope.$on('PostRefresh', function () {
|
||||
// Cleanup after a delete
|
||||
Wait('stop');
|
||||
$('#prompt-modal').off();
|
||||
$('#prompt-modal').modal('hide');
|
||||
});
|
||||
|
||||
// Initialize search and pagination, then load data
|
||||
|
@ -37,7 +37,7 @@ function PermissionsList($scope, $rootScope, $location, $log, $routeParams, Rest
|
||||
$scope.removePostRefresh = $scope.$on('PostRefresh', function () {
|
||||
// Cleanup after a delete
|
||||
Wait('stop');
|
||||
$('#prompt-modal').off();
|
||||
$('#prompt-modal').modal('hide');
|
||||
});
|
||||
|
||||
SearchInit({
|
||||
|
@ -47,7 +47,7 @@ function ProjectsList ($scope, $rootScope, $location, $log, $routeParams, Rest,
|
||||
// Cleanup after a delete
|
||||
var j, i;
|
||||
Wait('stop');
|
||||
$('#prompt-modal').off();
|
||||
$('#prompt-modal').modal('hide');
|
||||
|
||||
if ($scope.projects) {
|
||||
for (i = 0; i < $scope.projects.length; i++) {
|
||||
|
@ -36,7 +36,7 @@ function UsersList($scope, $rootScope, $location, $log, $routeParams, Rest, Aler
|
||||
$scope.removePostRefresh = $scope.$on('PostRefresh', function () {
|
||||
// Cleanup after a delete
|
||||
Wait('stop');
|
||||
$('#prompt-modal').off();
|
||||
$('#prompt-modal').modal('hide');
|
||||
});
|
||||
|
||||
$rootScope.flashMessage = null;
|
||||
|
@ -1057,7 +1057,7 @@ angular.module('GroupsHelper', ['RestServices', 'Utilities', 'ListGenerator', 'G
|
||||
Rest.setUrl(url);
|
||||
Rest.post({ id: node.group_id, disassociate: 1 })
|
||||
.success(function () {
|
||||
$('#prompt-modal').off();
|
||||
$('#prompt-modal').modal('hide');
|
||||
scope.$emit('GroupDeleteCompleted'); // Signal a group refresh to start
|
||||
})
|
||||
.error(function (data, status) {
|
||||
|
Loading…
Reference in New Issue
Block a user