From 608e9476b61b431d67f5cb1215b59c67d03d3b74 Mon Sep 17 00:00:00 2001 From: James Allen Date: Mon, 16 Jun 2014 16:17:28 +0100 Subject: [PATCH] Show confirmation for deleting projects forever --- services/web/app/views/project/list.jade | 2 +- services/web/public/coffee/project-list.coffee | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/services/web/app/views/project/list.jade b/services/web/app/views/project/list.jade index 2c7fbcc4fd..f9557c1bfa 100644 --- a/services/web/app/views/project/list.jade +++ b/services/web/app/views/project/list.jade @@ -177,7 +177,7 @@ block content data-original-title="Delete Forever", data-toggle="tooltip", data-placement="bottom", - ng-click="deleteSelectedProjects()" + ng-click="openDeleteProjectsModal()" ) Delete Forever .row.row-spaced diff --git a/services/web/public/coffee/project-list.coffee b/services/web/public/coffee/project-list.coffee index 9e6405e35d..7924df7ec3 100644 --- a/services/web/public/coffee/project-list.coffee +++ b/services/web/public/coffee/project-list.coffee @@ -345,6 +345,18 @@ ProjectPageApp.controller "ProjectPageController", ($scope, $modal, $http, $q) - $scope.updateVisibleProjects() + + $scope.openDeleteProjectsModal = () -> + modalInstance = $modal.open( + templateUrl: "deleteProjectsModalTemplate" + controller: "DeleteProjectsModalController" + resolve: + projects: () -> $scope.getSelectedProjects() + ) + + modalInstance.result.then () -> + $scope.deleteSelectedProjects() + $scope.deleteSelectedProjects = () -> selected_projects = $scope.getSelectedProjects() selected_project_ids = $scope.getSelectedProjectIds()