From d58c04a59276af6244e7b76fd52269132bf1d9a8 Mon Sep 17 00:00:00 2001 From: Angus McLeod Date: Sat, 22 Sep 2018 17:09:06 +1000 Subject: [PATCH] only show cause UI in cause categories --- .../widgets/donations-category-header-widget.js.es6 | 3 +-- assets/stylesheets/discourse-donations.scss | 1 - plugin.rb | 5 +++++ 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/assets/javascripts/discourse/widgets/donations-category-header-widget.js.es6 b/assets/javascripts/discourse/widgets/donations-category-header-widget.js.es6 index 9ea8717..46811fa 100644 --- a/assets/javascripts/discourse/widgets/donations-category-header-widget.js.es6 +++ b/assets/javascripts/discourse/widgets/donations-category-header-widget.js.es6 @@ -13,13 +13,12 @@ createWidget('category-header-widget', { tagName: 'span', html() { - const path = window.location.pathname; let category; const controller = this.container.lookup('controller:navigation/category'); category = controller.get("category"); - if(/^\/c\//.test(path)) { + if(category && category.donations_cause) { $("body").addClass("donations-category"); let contents = [ diff --git a/assets/stylesheets/discourse-donations.scss b/assets/stylesheets/discourse-donations.scss index 48aae71..248dd7a 100644 --- a/assets/stylesheets/discourse-donations.scss +++ b/assets/stylesheets/discourse-donations.scss @@ -151,7 +151,6 @@ div.stripe-errors { width: 500px; margin: 0 auto; font-size: 1.2rem; - padding-top: 10px; padding-bottom: 40px; display: flex; align-items: center; diff --git a/plugin.rb b/plugin.rb index 1674ad5..5a5547e 100644 --- a/plugin.rb +++ b/plugin.rb @@ -36,6 +36,10 @@ after_initialize do end class ::Category + def donations_cause + SiteSetting.discourse_donations_causes_categories.split('|').include? self.id.to_s + end + def donations_total if custom_fields['donations_total'] custom_fields['donations_total'] @@ -82,6 +86,7 @@ after_initialize do end if SiteSetting.discourse_donations_cause_category + add_to_serializer(:basic_category, :donations_cause) { object.donations_cause } add_to_serializer(:basic_category, :donations_total) { object.donations_total } add_to_serializer(:basic_category, :donations_month) { object.donations_month } add_to_serializer(:basic_category, :donations_backers) {