github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity

feat(kube): Add a confirmation modal before deleting one or more application or configuration (#4522)

pull/3937/head
Maxime Bajeux 2020-12-10 08:46:58 +01:00 committed by GitHub
parent 20cf948e53
commit 60c5ab3eec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/kubernetes/views/applications/applicationsController.js
View File

@ -79,7 +79,11 @@ class KubernetesApplicationsController {
} }
removeAction(selectedItems) { removeAction(selectedItems) {
return this.$async(this.removeActionAsync, selectedItems); this.ModalService.confirmDeletion('Do you want to remove the selected application(s)?', (confirmed) => {
if (confirmed) {
return this.$async(this.removeActionAsync, selectedItems);
}
});
} }
onPublishingModeClick(application) { onPublishingModeClick(application) {

9
app/kubernetes/views/configurations/configurationsController.js
View File

@ -3,12 +3,13 @@ import KubernetesConfigurationHelper from 'Kubernetes/helpers/configurationHelpe
class KubernetesConfigurationsController { class KubernetesConfigurationsController {
/* @ngInject */ /* @ngInject */
constructor($async, $state, Notifications, KubernetesConfigurationService, KubernetesApplicationService) { constructor($async, $state, Notifications, KubernetesConfigurationService, KubernetesApplicationService, ModalService) {
this.$async = $async; this.$async = $async;
this.$state = $state; this.$state = $state;
this.Notifications = Notifications; this.Notifications = Notifications;
this.KubernetesConfigurationService = KubernetesConfigurationService; this.KubernetesConfigurationService = KubernetesConfigurationService;
this.KubernetesApplicationService = KubernetesApplicationService; this.KubernetesApplicationService = KubernetesApplicationService;
this.ModalService = ModalService;
this.onInit = this.onInit.bind(this); this.onInit = this.onInit.bind(this);
this.getConfigurations = this.getConfigurations.bind(this); this.getConfigurations = this.getConfigurations.bind(this);
@ -56,7 +57,11 @@ class KubernetesConfigurationsController {
} }
removeAction(selectedItems) { removeAction(selectedItems) {
return this.$async(this.removeActionAsync, selectedItems); this.ModalService.confirmDeletion('Do you want to remove the selected configuration(s)?', (confirmed) => {
if (confirmed) {
return this.$async(this.removeActionAsync, selectedItems);
}
});
} }
async getApplicationsAsync() { async getApplicationsAsync() {