effective_polls 0.6.3 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a20ad391dc3c9332c540ddf58f76004950099c17f9305af1919c7f541251019
-  data.tar.gz: b6c5b6688300174b7f836b5572707006cc08b81e6c50bf131ca6127fedb48342
+  metadata.gz: 8f18ce3f4be236e848fdaf1f0cbc5964f1c7d0f4d1f89efcb0d4fd565b1d1d21
+  data.tar.gz: df60d1d96ad211ad97237165bcc366e1787dc03f3f938c1c4df7614184d34d6c
 SHA512:
-  metadata.gz: 2b624b1d4005ea65626a2d82fe33bff3640f4696670a8575f7c3aced34506e0b8fb21c8cfd201ffcdd5e72d1da4b7d2a50cbc5d0ee7f802fe0b3089e1fa24feb
-  data.tar.gz: 7b1b714ceafa0e11c52ded569ac091ca32b045a5d9fd2f5f6c1bd7915d6ba8baf3532f400a2588b040eb8ceb28470158c1a886198eb5851bc1e120da6ef1f2ae
+  metadata.gz: fbbad665eaaecdb8d975e63d44daa8846acedb2b601c5669c61d506b9fbf002e2b83cd9a6c3a5e3a8f26bd419c43cfb4280694dd6d36d9d04a61646090b4221f
+  data.tar.gz: 3bec1b83924572a0895ec8b3e499ad0d8ba590bbc58cf4bd429c22232fd9681d0f123d4bdd42e65776abfbd50c634b5185ed948ceffad948780c64741352319c

data/app/datatables/admin/effective_poll_notifications_datatable.rb

@@ -13,6 +13,10 @@ class Admin::EffectivePollNotificationsDatatable < Effective::Datatable
     col :poll
     col :category
 
+    col :from, visible: false do |notification|
+      ERB::Util.html_escape_once(notification.from)
+    end
+
     col :reminder do |poll_notification|
       case poll_notification.category
       when 'When poll starts'
@@ -36,6 +40,10 @@ class Admin::EffectivePollNotificationsDatatable < Effective::Datatable
       simple_format(notification.body.to_s)
     end
 
+    col :cc, visible: false
+    col :bcc, visible: false
+    col :content_type, visible: false
+
     col :started_at, visible: false
     col :completed_at
 

data/app/models/concerns/effective_polls_user.rb

@@ -21,6 +21,7 @@ module EffectivePollsUser
 
   # The list of all available audience scopes for the Poll Selected Users
   def poll_audience_scopes
+    default_poll_audience_scopes()
   end
 
   def default_poll_audience_scopes

data/app/models/effective/poll_notification.rb

@@ -1,8 +1,10 @@
 module Effective
   class PollNotification < ActiveRecord::Base
-    belongs_to :poll
+    acts_as_email_notification # effective_resources
     log_changes(to: :poll) if respond_to?(:log_changes)
 
+    belongs_to :poll
+
     CATEGORIES = ['Upcoming reminder', 'When poll starts', 'Reminder', 'Before poll ends', 'When poll ends']
     EMAIL_TEMPLATE_VARIABLES = ['available_date', 'title', 'url', 'user.name', 'user.email']
 
@@ -49,6 +51,10 @@ module Effective
       subject           :string
       body              :text
 
+      cc                :string
+      bcc               :string
+      content_type      :string
+
       # Tracking background jobs email send out
       started_at        :datetime
       completed_at      :datetime
@@ -68,13 +74,6 @@ module Effective
     validates :poll, presence: true
     validates :category, presence: true, inclusion: { in: CATEGORIES }
 
-    validates :from, presence: true
-    validates :subject, presence: true
-    validates :body, presence: true
-
-    validates :body, liquid: true
-    validates :subject, liquid: true
-
     validates :reminder, if: -> { reminder? || upcoming_reminder? || before_poll_ends? },
       presence: true, uniqueness: { scope: [:poll_id, :category], message: 'already exists' }
 
@@ -86,6 +85,10 @@ module Effective
       'poll_' + category.to_s.parameterize.underscore
     end
 
+    def email_template_variables
+      EMAIL_TEMPLATE_VARIABLES
+    end
+
     def upcoming_reminder?
       category == 'Upcoming reminder'
     end
@@ -148,7 +151,8 @@ module Effective
           Effective::PollsMailer.public_send(email_template, self, user).deliver_now
         rescue => e
           EffectiveLogger.error(e.message, associated: self) if defined?(EffectiveLogger)
-          ExceptionNotifier.notify_exception(e, data: { user_id: user.id }) if defined?(ExceptionNotifier)
+          ExceptionNotifier.notify_exception(e, data: { user_id: user.id, poll_notification_id: id }) if defined?(ExceptionNotifier)
+          raise(e) if Rails.env.test? || Rails.env.development?
         end
 
       end

data/app/views/admin/poll_notifications/_form.html.haml

@@ -13,25 +13,6 @@
 
     = f.show_if :category, category do
       .my-3= render "/admin/poll_notifications/form_#{template}", f: f
-      
-      - if f.object.category == category && f.object.persisted?
-        = f.select :from, mailer_froms_collection(), label: 'From'
-        = f.text_field :subject
-        = f.text_area :body, rows: 10
-      - else
-        - email_template = Effective::EmailTemplate.where(template_name: template).first!
-        - from_value = email_template.from || EffectiveResources.mailer_froms.first
-
-        = f.select :from, mailer_froms_collection(), label: 'From', value: from_value
-        = f.text_field :subject, value: email_template.subject
-        = f.text_area :body, rows: 10, value: email_template.body
-
-        %p The available variables are:
-
-        %ul
-          - Effective::PollNotification::EMAIL_TEMPLATE_VARIABLES.each do |variable|
-            %li {{ #{variable} }}
-
-        %small.text-muted Please contact us to add additional variables
+      = email_notification_fields(f, template, variables: Effective::PollNotification::EMAIL_TEMPLATE_VARIABLES)
 
   = effective_submit(f)

data/app/views/admin/polls/_form_poll.html.haml

@@ -6,7 +6,7 @@
   = f.datetime_field :end_at
 
   - if f.object.poll_notifications.present?
-    .alert.alert-info
+    .alert.alert-info.mb-3
       Please be aware of the existing #{ets(f.object.poll_notifications)} when changing the start or end availability date.
 
   = f.check_box :hide_results, 

data/db/migrate/101_create_effective_polls.rb

@@ -29,6 +29,10 @@ class CreateEffectivePolls < ActiveRecord::Migration[6.0]
       t.string :subject
       t.text :body
 
+      t.string :cc
+      t.string :bcc
+      t.string :content_type
+
       t.datetime :started_at
       t.datetime :completed_at
 

data/lib/effective_polls/version.rb

@@ -1,3 +1,3 @@
 module EffectivePolls
-  VERSION = '0.6.3'
+  VERSION = '0.7.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_polls
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.7.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-22 00:00:00.000000000 Z
+date: 2024-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails