diff --git a/app/models/email_settings.rb b/app/models/email_settings.rb index 5735a2f0..633c6834 100644 --- a/app/models/email_settings.rb +++ b/app/models/email_settings.rb @@ -5,7 +5,8 @@ class EmailSettings < ActiveRecord::Base :registration_subject, :accepted_subject, :rejected_subject, :confirmed_without_registration_subject, :send_on_updated_conference_dates, :updated_conference_dates_subject, - :updated_conference_dates_template + :updated_conference_dates_template, :send_on_updated_conference_registration_dates, + :updated_conference_registration_dates_subject, :updated_conference_registration_dates_template def get_values(conference, user, event = nil) h = { diff --git a/db/migrate/20140710130608_add_conference_registration_dates_updates_to_email_settings.rb b/db/migrate/20140710130608_add_conference_registration_dates_updates_to_email_settings.rb new file mode 100644 index 00000000..6313619b --- /dev/null +++ b/db/migrate/20140710130608_add_conference_registration_dates_updates_to_email_settings.rb @@ -0,0 +1,7 @@ +class AddConferenceRegistrationDatesUpdatesToEmailSettings < ActiveRecord::Migration + def change + add_column :email_settings, :send_on_updated_conference_registration_dates, :boolean, default: true + add_column :email_settings, :updated_conference_registration_dates_subject, :string + add_column :email_settings, :updated_conference_registration_dates_template, :text + end +end diff --git a/db/schema.rb b/db/schema.rb index f2d0733a..1cc455ee 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20140714141156) do +ActiveRecord::Schema.define(version: 20140710130608) do create_table "ahoy_events", force: true do |t| t.uuid "visit_id" @@ -150,10 +150,10 @@ ActiveRecord::Schema.define(version: 20140714141156) do create_table "email_settings", force: true do |t| t.integer "conference_id" - t.boolean "send_on_registration", default: true - t.boolean "send_on_accepted", default: true - t.boolean "send_on_rejected", default: true - t.boolean "send_on_confirmed_without_registration", default: true + t.boolean "send_on_registration", default: true + t.boolean "send_on_accepted", default: true + t.boolean "send_on_rejected", default: true + t.boolean "send_on_confirmed_without_registration", default: true t.text "registration_email_template" t.text "accepted_email_template" t.text "rejected_email_template" @@ -164,9 +164,12 @@ ActiveRecord::Schema.define(version: 20140714141156) do t.string "accepted_subject" t.string "rejected_subject" t.string "confirmed_without_registration_subject" - t.boolean "send_on_updated_conference_dates", default: true + t.boolean "send_on_updated_conference_dates", default: true t.string "updated_conference_dates_subject" t.text "updated_conference_dates_template" + t.boolean "send_on_updated_conference_registration_dates", default: true + t.string "updated_conference_registration_dates_subject" + t.text "updated_conference_registration_dates_template" end create_table "event_attachments", force: true do |t|