From 445e37392a03db9d7ea8b50e8f078746e351f78f Mon Sep 17 00:00:00 2001 From: Thomas Pinetz Date: Wed, 8 Jul 2015 09:39:39 +0200 Subject: [PATCH] Added the localized custom delete message functionality with params --- .../controller/cat-base-list-controller.js | 6 +++-- .../directives/cat-confirm-click.js | 22 ++++++++++++++++--- .../template/cat-base-detail.tpl.html | 2 +- 3 files changed, 24 insertions(+), 6 deletions(-) diff --git a/src/main/javascript/controller/cat-base-list-controller.js b/src/main/javascript/controller/cat-base-list-controller.js index 8e98d34..0b83074 100644 --- a/src/main/javascript/controller/cat-base-list-controller.js +++ b/src/main/javascript/controller/cat-base-list-controller.js @@ -55,9 +55,11 @@ function CatBaseListController($scope, $state, $controller, $log, catBreadcrumbs return this.getUrlForId('new'); }; - this.remove = function(id) { + this.remove = function (id, message) { + message = message || 'Successfully deleted entry.'; config.listData.endpoint.remove(id) - .then(function() { + .then(function () { + $globalMessages.addMessage('success', message, true); catListDataLoadingService.load(config.listData.endpoint, config.listData.searchRequest).then( function (data) { _.assign($scope.listData, data); diff --git a/src/main/javascript/directives/cat-confirm-click.js b/src/main/javascript/directives/cat-confirm-click.js index f9ee4a0..7d73a42 100644 --- a/src/main/javascript/directives/cat-confirm-click.js +++ b/src/main/javascript/directives/cat-confirm-click.js @@ -3,18 +3,34 @@ /** * @ngdoc directive * @name cat.directives.confirmClick:catConfirmClick + * + * @param cat-i18n-params cat-i18n-params need to be parsed as JSON or it will not work */ angular.module('cat.directives.confirmClick', []) - .directive('catConfirmClick', function CatConfirmClickDirective() { + .directive('catConfirmClick', function CatConfirmClickDirective(catI18nService) { return { restrict: 'A', link: function CatConfirmClickLink(scope, element, attr) { var msg = attr.catConfirmClick || 'Are you sure?'; var clickAction = attr.catOnConfirm; + var params = undefined; + if (!!attr.catI18nParams) { + params = JSON.parse(attr.catI18nParams); + } element.bind('click', function (event) { - if (window.confirm(msg)) { - scope.$eval(clickAction); + function dialog(dialogMessage) { + if (window.confirm(dialogMessage)) { + scope.$eval(clickAction); + } } + + catI18nService.translate(msg, params).then( + function (message) { + dialog(message); + }, function (reason) { + dialog(msg); + } + ); }); } }; diff --git a/src/main/resources/template/cat-base-detail.tpl.html b/src/main/resources/template/cat-base-detail.tpl.html index 05ef82c..8ca54c5 100644 --- a/src/main/resources/template/cat-base-detail.tpl.html +++ b/src/main/resources/template/cat-base-detail.tpl.html @@ -6,7 +6,7 @@
-