diff --git a/assets/javascripts/discourse/routes/admin-plugins-discourse-patrons-subscriptions.js.es6 b/assets/javascripts/discourse/routes/admin-plugins-discourse-patrons-subscriptions.js.es6 index 7644224..bfca9f0 100644 --- a/assets/javascripts/discourse/routes/admin-plugins-discourse-patrons-subscriptions.js.es6 +++ b/assets/javascripts/discourse/routes/admin-plugins-discourse-patrons-subscriptions.js.es6 @@ -15,12 +15,17 @@ export default Discourse.Route.extend({ I18n.t("yes_value"), confirmed => { if (confirmed) { + subscription.set("loading", true); + subscription .destroy() .then(result => subscription.set("status", result.status)) .catch(data => bootbox.alert(data.jqXHR.responseJSON.errors.join("\n")) - ); + ) + .finally(() => { + subscription.set("loading", false); + }); } } ); diff --git a/assets/javascripts/discourse/routes/user-subscriptions.js.es6 b/assets/javascripts/discourse/routes/user-subscriptions.js.es6 index a02059b..571e2ac 100644 --- a/assets/javascripts/discourse/routes/user-subscriptions.js.es6 +++ b/assets/javascripts/discourse/routes/user-subscriptions.js.es6 @@ -23,12 +23,17 @@ export default Discourse.Route.extend({ I18n.t("yes_value"), confirmed => { if (confirmed) { + subscription.set("loading", true); + subscription .destroy() .then(result => subscription.set("status", result.status)) .catch(data => bootbox.alert(data.jqXHR.responseJSON.errors.join("\n")) - ); + ) + .finally(() => { + subscription.set("loading", false); + }); } } ); diff --git a/assets/javascripts/discourse/templates/admin/plugins-discourse-patrons-subscriptions.hbs b/assets/javascripts/discourse/templates/admin/plugins-discourse-patrons-subscriptions.hbs index 2f62c27..8a1b26d 100644 --- a/assets/javascripts/discourse/templates/admin/plugins-discourse-patrons-subscriptions.hbs +++ b/assets/javascripts/discourse/templates/admin/plugins-discourse-patrons-subscriptions.hbs @@ -23,7 +23,13 @@