From 8770122eae4b76de7b8ffe468a28405f05156c84 Mon Sep 17 00:00:00 2001 From: Rob Harrington Date: Wed, 11 Apr 2018 15:30:33 +1000 Subject: [PATCH] Request the subscription count for change warning each time, don't cache --- .../admin/order_cycles/directives/change-warning.js.coffee | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/admin/order_cycles/directives/change-warning.js.coffee b/app/assets/javascripts/admin/order_cycles/directives/change-warning.js.coffee index 8c7b84fb62..acd987069b 100644 --- a/app/assets/javascripts/admin/order_cycles/directives/change-warning.js.coffee +++ b/app/assets/javascripts/admin/order_cycles/directives/change-warning.js.coffee @@ -4,16 +4,16 @@ angular.module("admin.orderCycles").directive "changeWarning", (ConfirmDialog) - orderCycle: '=changeWarning' link: (scope, element, attrs) -> acknowledged = false - count = scope.orderCycle.subscriptions_count cancel = 'admin.order_cycles.date_warning.cancel' proceed = 'admin.order_cycles.date_warning.proceed' - msg = t('admin.order_cycles.date_warning.msg', n: count) + msg = 'admin.order_cycles.date_warning.msg' options = { cancel: t(cancel), confirm: t(proceed) } element.focus -> + count = scope.orderCycle.subscriptions_count return if acknowledged return if moment(scope.orderCycle.orders_close_at).isBefore() return if count < 1 - ConfirmDialog.open('info', msg, options).then -> + ConfirmDialog.open('info', t(msg, n: count), options).then -> acknowledged = true element.siblings('img').trigger('click')