Merge pull request #9245 from CitizenLabDotCo/TAN-2894-allow-all-auto…

…mated-emails-to-be-turned-off TAN-2894 - Allow ALL automated emails to be disabled
CitizenLabDotCo · Oct 31, 2024 · 306cf13 · 306cf13
2 parents 96d81d8 + f6b3bc7
commit 306cf13
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 0 deletions.
diff --git a/back/engines/free/email_campaigns/app/models/concerns/email_campaigns/disableable.rb b/back/engines/free/email_campaigns/app/models/concerns/email_campaigns/disableable.rb
@@ -4,6 +4,9 @@ module EmailCampaigns
   module Disableable
     extend ActiveSupport::Concern
 
+    # NOTE: This concern is now applied to all campaigns
+    # but is left here so that future campaigns have the ability to not be disabled
+
     # If one instance is enabled, we consider the campaign_type enabled. This
     # returns all campaign_types that are not all disabled
     def self.enabled_campaign_types(instances)

diff --git a/...s/free/email_campaigns/app/models/email_campaigns/campaigns/comment_on_idea_you_follow.rb b/...s/free/email_campaigns/app/models/email_campaigns/campaigns/comment_on_idea_you_follow.rb
@@ -31,6 +31,7 @@
 module EmailCampaigns
   class Campaigns::CommentOnIdeaYouFollow < Campaign
     include Consentable
+    include Disableable
     include ActivityTriggerable
     include RecipientConfigurable
     include LifecycleStageRestrictable

diff --git a/.../email_campaigns/app/models/email_campaigns/campaigns/comment_on_initiative_you_follow.rb b/.../email_campaigns/app/models/email_campaigns/campaigns/comment_on_initiative_you_follow.rb
@@ -31,6 +31,7 @@
 module EmailCampaigns
   class Campaigns::CommentOnInitiativeYouFollow < Campaign
     include Consentable
+    include Disableable
     include ActivityTriggerable
     include RecipientConfigurable
     include LifecycleStageRestrictable

diff --git a/...il_campaigns/app/models/email_campaigns/campaigns/official_feedback_on_idea_you_follow.rb b/...il_campaigns/app/models/email_campaigns/campaigns/official_feedback_on_idea_you_follow.rb
@@ -31,6 +31,7 @@
 module EmailCampaigns
   class Campaigns::OfficialFeedbackOnIdeaYouFollow < Campaign
     include Consentable
+    include Disableable
     include ActivityTriggerable
     include RecipientConfigurable
     include Trackable

diff --git a/...paigns/app/models/email_campaigns/campaigns/official_feedback_on_initiative_you_follow.rb b/...paigns/app/models/email_campaigns/campaigns/official_feedback_on_initiative_you_follow.rb
@@ -31,6 +31,7 @@
 module EmailCampaigns
   class Campaigns::OfficialFeedbackOnInitiativeYouFollow < Campaign
     include Consentable
+    include Disableable
     include ActivityTriggerable
     include RecipientConfigurable
     include Trackable

diff --git a/back/engines/free/email_campaigns/app/models/email_campaigns/campaigns/project_published.rb b/back/engines/free/email_campaigns/app/models/email_campaigns/campaigns/project_published.rb
@@ -31,6 +31,7 @@
 module EmailCampaigns
   class Campaigns::ProjectPublished < Campaign
     include Consentable
+    include Disableable
     include ActivityTriggerable
     include RecipientConfigurable
     include Trackable

diff --git a/.../email_campaigns/app/models/email_campaigns/campaigns/status_change_on_idea_you_follow.rb b/.../email_campaigns/app/models/email_campaigns/campaigns/status_change_on_idea_you_follow.rb
@@ -31,6 +31,7 @@
 module EmailCampaigns
   class Campaigns::StatusChangeOnIdeaYouFollow < Campaign
     include Consentable
+    include Disableable
     include ActivityTriggerable
     include RecipientConfigurable
     include Trackable

diff --git a/..._campaigns/app/models/email_campaigns/campaigns/status_change_on_initiative_you_follow.rb b/..._campaigns/app/models/email_campaigns/campaigns/status_change_on_initiative_you_follow.rb
@@ -31,6 +31,7 @@
 module EmailCampaigns
   class Campaigns::StatusChangeOnInitiativeYouFollow < Campaign
     include Consentable
+    include Disableable
     include ActivityTriggerable
     include RecipientConfigurable
     include Trackable