From 24cdd0c4673dc879fdf47ea77a6760f0f9ac90cc Mon Sep 17 00:00:00 2001 From: Luis Ramos Date: Tue, 18 Aug 2020 18:14:03 +0100 Subject: [PATCH] Refactor enterprise controller to reduce code duplication --- .../enterprise_controller.js.coffee | 30 +++++++++++-------- 1 file changed, 17 insertions(+), 13 deletions(-) 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 bf588bd876..30a0d8cf41 100644 --- a/app/assets/javascripts/admin/enterprises/controllers/enterprise_controller.js.coffee +++ b/app/assets/javascripts/admin/enterprises/controllers/enterprise_controller.js.coffee @@ -69,25 +69,29 @@ angular.module("admin.enterprises") $scope.newUser = $scope.invite_errors = $scope.invite_success = null $scope.removeLogo = -> - return unless confirm(t("js.admin.enterprises.form.images.immediate_logo_removal_warning")) + return unless confirm($scope.translation("immediate_logo_removal_warning")) - Enterprises.removeLogo($scope.Enterprise).then (data) -> - $scope.Enterprise = angular.copy(data) - $scope.$emit("enterprise:updated", $scope.Enterprise) - - StatusMessage.display("success", t("js.admin.enterprises.form.images.removed_logo_successfully")) - , (response) -> - if response.data.error? - StatusMessage.display("failure", response.data.error) + Enterprises.removeLogo($scope.Enterprise) + .then $scope.removeImageSuccessCallback("removed_logo_successfully"), + $scope.removeImageSuccessCallback() $scope.removePromoImage = -> - return unless confirm(t("js.admin.enterprises.form.images.immediate_promo_image_removal_warning")) + return unless confirm($scope.translation("immediate_promo_image_removal_warning")) - Enterprises.removePromoImage($scope.Enterprise).then (data) -> + Enterprises.removePromoImage($scope.Enterprise) + .then $scope.removeImageSuccessCallback("removed_promo_image_successfully"), + $scope.removeImageSuccessCallback() + + $scope.removeImageSuccessCallback = (success_message_key) -> + (data) -> $scope.Enterprise = angular.copy(data) $scope.$emit("enterprise:updated", $scope.Enterprise) + StatusMessage.display("success", $scope.translation(success_message_key)) - StatusMessage.display("success", t("js.admin.enterprises.form.images.removed_promo_image_successfully")) - , (response) -> + $scope.removeImageErrorCallback = -> + (response) -> if response.data.error? StatusMessage.display("failure", response.data.error) + + $scope.translation = (key) -> + t('js.admin.enterprises.form.images.' + key)