diff --git a/awx/ui/client/src/inventories-hosts/inventories/related/sources/list/sources-list.controller.js b/awx/ui/client/src/inventories-hosts/inventories/related/sources/list/sources-list.controller.js
index e0798e714d..becf28c83b 100644
--- a/awx/ui/client/src/inventories-hosts/inventories/related/sources/list/sources-list.controller.js
+++ b/awx/ui/client/src/inventories-hosts/inventories/related/sources/list/sources-list.controller.js
@@ -117,38 +117,11 @@
$state.go('inventories.edit.inventory_sources.edit', {inventory_source_id: id});
};
$scope.deleteSource = function(inventory_source){
- var body = '
' + i18n._('Are you sure you want to permanently delete the inventory source below from the inventory?') + '
' + $filter('sanitize')(inventory_source.name) + '
';
+ var body = '' + i18n._('Confirm that you want to permanently delete the inventory source below from the inventory. Deleting this inventory source also deletes its associated groups and hosts.') + '
' + $filter('sanitize')(inventory_source.name) + '
';
var action = function(){
- delete $rootScope.promptActionBtnClass;
+ $rootScope.promptActionBtnClass = "Modal-errorButton--sourcesDelete";
Wait('start');
- SourcesService.deleteHosts(inventory_source.id).then(() => {
- SourcesService.delete(inventory_source.id).then(() => {
- $('#prompt-modal').modal('hide');
- let reloadListStateParams = null;
-
- if($scope.inventory_sources.length === 1 && $state.params.inventory_source_search && !_.isEmpty($state.params.inventory_source_search.page) && $state.params.inventory_source_search.page !== '1') {
- reloadListStateParams = _.cloneDeep($state.params);
- reloadListStateParams.inventory_source_search.page = (parseInt(reloadListStateParams.inventory_source_search.page)-1).toString();
- }
- if (parseInt($state.params.inventory_source_id) === inventory_source.id) {
- $state.go('^', reloadListStateParams, {reload: true});
- } else {
- $state.go('.', reloadListStateParams, {reload: true});
- }
- Wait('stop');
- })
- .catch(({data, status}) => {
- $('#prompt-modal').modal('hide');
- Wait('stop');
- ProcessErrors($scope, data, status, null,
- {
- hdr: i18n._('Error!'),
- msg: i18n._('There was an error deleting inventory source. Returned status: ') +
- status
- });
- });
- })
- .catch(({data, status}) => {
+ let hostDelete = SourcesService.deleteHosts(inventory_source.id).catch(({data, status}) => {
$('#prompt-modal').modal('hide');
Wait('stop');
ProcessErrors($scope, data, status, null,
@@ -158,6 +131,44 @@
status
});
});
+ let groupDelete = SourcesService.deleteGroups(inventory_source.id).catch(({data, status}) => {
+ $('#prompt-modal').modal('hide');
+ Wait('stop');
+ ProcessErrors($scope, data, status, null,
+ {
+ hdr: i18n._('Error!'),
+ msg: i18n._('There was an error deleting inventory source groups. Returned status: ') +
+ status
+ });
+ });
+ Promise.all([hostDelete, groupDelete]).then(() => {
+ SourcesService.delete(inventory_source.id).then(() => {
+ $('#prompt-modal').modal('hide');
+ delete $rootScope.promptActionBtnClass;
+ let reloadListStateParams = null;
+
+ if($scope.inventory_sources.length === 1 && $state.params.inventory_source_search && !_.isEmpty($state.params.inventory_source_search.page) && $state.params.inventory_source_search.page !== '1') {
+ reloadListStateParams = _.cloneDeep($state.params);
+ reloadListStateParams.inventory_source_search.page = (parseInt(reloadListStateParams.inventory_source_search.page)-1).toString();
+ }
+ if (parseInt($state.params.inventory_source_id) === inventory_source.id) {
+ $state.go('^', reloadListStateParams, {reload: true});
+ } else {
+ $state.go('.', reloadListStateParams, {reload: true});
+ }
+ Wait('stop');
+ })
+ .catch(({data, status}) => {
+ $('#prompt-modal').modal('hide');
+ Wait('stop');
+ ProcessErrors($scope, data, status, null,
+ {
+ hdr: i18n._('Error!'),
+ msg: i18n._('There was an error deleting inventory source. Returned status: ') +
+ status
+ });
+ });
+ });
};
// Prompt depends on having $rootScope.promptActionBtnClass available...
Prompt({
diff --git a/awx/ui/client/src/inventories-hosts/inventories/related/sources/sources.service.js b/awx/ui/client/src/inventories-hosts/inventories/related/sources/sources.service.js
index 93894d7126..1d2f55054f 100644
--- a/awx/ui/client/src/inventories-hosts/inventories/related/sources/sources.service.js
+++ b/awx/ui/client/src/inventories-hosts/inventories/related/sources/sources.service.js
@@ -134,13 +134,20 @@ export default
}
},
deleteHosts(id) {
- Wait('start');
this.url = GetBasePath('inventory_sources') + id + '/hosts/';
Rest.setUrl(this.url);
return Rest.destroy()
.success(this.success.bind(this))
.error(this.error.bind(this))
- .finally(Wait('stop'));
+ .finally();
+ },
+ deleteGroups(id) {
+ this.url = GetBasePath('inventory_sources') + id + '/groups/';
+ Rest.setUrl(this.url);
+ return Rest.destroy()
+ .success(this.success.bind(this))
+ .error(this.error.bind(this))
+ .finally();
}
};
}];
diff --git a/awx/ui/client/src/shared/modal/modal.less b/awx/ui/client/src/shared/modal/modal.less
index 9c741f4131..632720fec6 100644
--- a/awx/ui/client/src/shared/modal/modal.less
+++ b/awx/ui/client/src/shared/modal/modal.less
@@ -97,6 +97,10 @@
color: @btn-txt-sel;
}
+.Modal-errorButton--sourcesDelete:hover{
+ cursor: not-allowed;
+}
+
.Modal-primaryButton {
background-color: @default-link;
color: @default-bg;