gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use each to iterate over array in mailer and fix comment link

Browse source 
*_url gives complete path with host
This commit is contained in:
Aditya Prakash 2016-03-29 23:22:32 +05:30
parent 11bae37cc4
commit d9db395ec6
5 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

0
app/mailers/.gitkeep
View file

10
app/mailers/mailbot.rb
View file

@ -36,7 +36,7 @@ class Mailbot < ActionMailer::Base
end
def conference_date_update_mail(conference)
User.joins(:subscriptions).merge(conference.subscriptions) do |user|
User.joins(:subscriptions).merge(conference.subscriptions).each do |user|
build_email(conference,
user.email,
conference.email_settings.conference_dates_updated_subject,
@ -45,7 +45,7 @@ class Mailbot < ActionMailer::Base
end
def conference_registration_date_update_mail(conference)
User.joins(:subscriptions).merge(conference.subscriptions).uniq.joins('INNER JOIN registrations ON registrations.user_id != users.id').merge(conference.registrations) do |user|
User.joins(:subscriptions).merge(conference.subscriptions).uniq.joins('INNER JOIN registrations ON registrations.user_id != users.id').merge(conference.registrations).each do |user|
build_email(conference,
user.email,
conference.email_settings.conference_registration_dates_updated_subject,
@ -54,7 +54,7 @@ class Mailbot < ActionMailer::Base
end
def send_email_on_venue_updated(conference)
User.joins(:subscriptions).merge(conference.subscriptions) do |user|
User.joins(:subscriptions).merge(conference.subscriptions).each do |user|
build_email(conference,
user.email,
conference.email_settings.venue_updated_subject,
@ -63,7 +63,7 @@ class Mailbot < ActionMailer::Base
end
def send_on_schedule_public(conference)
User.joins(:subscriptions).merge(conference.subscriptions) do |user|
User.joins(:subscriptions).merge(conference.subscriptions).each do |user|
build_email(conference,
user.email,
conference.email_settings.program_schedule_public_subject,
@ -72,7 +72,7 @@ class Mailbot < ActionMailer::Base
end
def send_on_cfp_dates_updates(conference)
User.joins(:subscriptions).merge(conference.subscriptions) do |user|
User.joins(:subscriptions).merge(conference.subscriptions).each do |user|
build_email(conference,
user.email,
conference.email_settings.cfp_dates_updated_subject,

2
app/models/email_settings.rb
View file

@ -1,4 +1,6 @@
class EmailSettings < ActiveRecord::Base
belongs_to :conference
def get_values(conference, user, event = nil)
h = {
'email' => user.email,

2
app/views/admin/emails/comment_template.text.erb
View file

@ -4,7 +4,7 @@ User <%= @comment.user.name %> posted a new comment for event <%= @event.title %
"<%= @comment.body %>"
To reply to this comment, please go to <%= h( admin_conference_event_url(@conference.short_title, @event)) %>
To reply to this comment, please go to <%= h(admin_conference_program_event_url(@conference.short_title, @event, only_path: false)) %>
Best wishes,
<%= @conference.title %> Team

2
app/views/admin/emails/index.html.haml
View file

@ -35,7 +35,7 @@
= f.input :send_on_rejected, label: "Send an email when the proposal is rejected?", :input_html => {"data-name"=>"email_settings_rejected_subject", "class"=>"send_on_radio"}
= f.input :rejected_subject
= f.input :rejected_body, :input_html => { :rows => 10, :cols => 20 }
%a.btn.btn-link.control_label.load_template{"data-template"=>"Dear {name},\n\nThank you for your submission {eventtitle} for the conference {conference}.\nAfter careful consideration we are sorry to inform you that your submissionhas been rejected.\n\n\nBest wishes\n\n{conference} Team",
%a.btn.btn-link.control_label.load_template{"data-template"=>"Dear {name},\n\nThank you for your submission {eventtitle} for the conference {conference}.\nAfter careful consideration we are sorry to inform you that your submission has been rejected.\n\n\nBest wishes\n\n{conference} Team",
"data-name"=>"email_settings_rejected_body"} Load Template
%a.btn.btn-link.control_label.template_help_link{"data-name"=>"rejected_help"} Show Help
= render partial: 'help', locals: {id: 'rejected_help', show_event_variables: true}