From ce0758d4209a58d8880c8a38905111e41e6a70a9 Mon Sep 17 00:00:00 2001 From: Kristina Lim Date: Mon, 30 Jul 2018 08:39:37 +0800 Subject: [PATCH] Add confirm dialog for enterprise image removal --- .../enterprises/controllers/enterprise_controller.js.coffee | 4 ++++ config/locales/en.yml | 2 ++ .../controllers/enterprise_controller_spec.js.coffee | 2 ++ 3 files changed, 8 insertions(+) diff --git a/app/assets/javascripts/admin/enterprises/controllers/enterprise_controller.js.coffee b/app/assets/javascripts/admin/enterprises/controllers/enterprise_controller.js.coffee index a6b0a40958..4acd61e84b 100644 --- a/app/assets/javascripts/admin/enterprises/controllers/enterprise_controller.js.coffee +++ b/app/assets/javascripts/admin/enterprises/controllers/enterprise_controller.js.coffee @@ -69,6 +69,8 @@ angular.module("admin.enterprises") $scope.newUser = $scope.invite_errors = $scope.invite_success = null $scope.removeLogo = -> + return unless confirm(t("admin.enterprises.remove_logo.immediate_removal_warning")) + Enterprises.removeLogo($scope.Enterprise).then (data) -> $scope.Enterprise = angular.copy(data) $scope.$emit("enterprise:updated", $scope.Enterprise) @@ -79,6 +81,8 @@ angular.module("admin.enterprises") StatusMessage.display("failure", response.data.error) $scope.removePromoImage = -> + return unless confirm(t("admin.enterprises.remove_promo_image.immediate_removal_warning")) + Enterprises.removePromoImage($scope.Enterprise).then (data) -> $scope.Enterprise = angular.copy(data) $scope.$emit("enterprise:updated", $scope.Enterprise) diff --git a/config/locales/en.yml b/config/locales/en.yml index 677b3b9d2f..bfb9b8486d 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -834,9 +834,11 @@ en: remove_logo: remove: "Remove Image" removed_successfully: "Logo removed successfully" + immediate_removal_warning: "The logo will be removed immediately after you confirm." remove_promo_image: remove: "Remove Image" removed_successfully: "Promo image removed successfully" + immediate_removal_warning: "The promo image will be removed immediately after you confirm." welcome: welcome_title: Welcome to the Open Food Network! welcome_text: You have successfully created a diff --git a/spec/javascripts/unit/admin/enterprises/controllers/enterprise_controller_spec.js.coffee b/spec/javascripts/unit/admin/enterprises/controllers/enterprise_controller_spec.js.coffee index 8ea5d60837..475de27e29 100644 --- a/spec/javascripts/unit/admin/enterprises/controllers/enterprise_controller_spec.js.coffee +++ b/spec/javascripts/unit/admin/enterprises/controllers/enterprise_controller_spec.js.coffee @@ -42,6 +42,7 @@ describe "enterpriseCtrl", -> beforeEach inject ($q) -> spyOn(scope, "$emit") deferred = $q.defer() + spyOn(window, "confirm").and.returnValue(true) spyOn(Enterprises, "removeLogo").and.returnValue(deferred.promise) spyOn(StatusMessage, "display").and.callThrough() scope.removeLogo() @@ -74,6 +75,7 @@ describe "enterpriseCtrl", -> beforeEach inject ($q) -> spyOn(scope, "$emit") deferred = $q.defer() + spyOn(window, "confirm").and.returnValue(true) spyOn(Enterprises, "removePromoImage").and.returnValue(deferred.promise) spyOn(StatusMessage, "display").and.callThrough() scope.removePromoImage()