gunghogeoduck/osem-fcy
1
0
Fork 0
mirror of https://github.com/openSUSE/osem.git synced 2026-08-13 19:54:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #491 from hennevogel/master

Browse source 
More accept/reject/confirm fixes
This commit is contained in:
Henne Vogelsang 2014-09-01 17:18:54 +02:00
commit 33d5775d52
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/mailers/mailbot.rb
View file

@ -14,7 +14,7 @@ class Mailbot < ActionMailer::Base
build_email(conference,
person.email,
conference.email_settings.accepted_subject,
conference.email_settings.generate_event_email(event, conference.email_settings.accepted_email_template))
conference.email_settings.generate_event_mail(event, conference.email_settings.accepted_email_template))
end
def rejection_mail(event)
@ -23,7 +23,7 @@ class Mailbot < ActionMailer::Base
build_email(conference,
person.email,
conference.email_settings.rejected_subject,
conference.email_settings.generate_event_email(event, conference.email_settings.rejected_email_template))
conference.email_settings.generate_event_mail(event, conference.email_settings.rejected_email_template))
end
def confirm_reminder_mail(event)
@ -32,7 +32,7 @@ class Mailbot < ActionMailer::Base
build_email(conference,
person.email,
conference.email_settings.confirmed_without_registration_subject,
conference.email_settings.generate_event_email(event, conference.email_settings.confirmed_email_template))
conference.email_settings.generate_event_mail(event, conference.email_settings.confirmed_email_template))
end
def conference_date_update_mail(conference)

4
app/models/email_settings.rb
View file

@ -21,7 +21,7 @@ class EmailSettings < ActiveRecord::Base
'conference_end_date' => conference.end_date,
'venue' => conference.venue.name,
'venue_address' => conference.venue.address,
'registrationlink' => Rails.application.routes.url_helpers.register_conference_url(
'registrationlink' => Rails.application.routes.url_helpers.new_conference_conference_registrations_url(
conference.short_title, host: CONFIG['url_for_emails']),
'conference_splash_link' => Rails.application.routes.url_helpers.conference_url(
conference.short_title, host: CONFIG['url_for_emails']),
@ -38,7 +38,7 @@ class EmailSettings < ActiveRecord::Base
if !event.nil?
h['eventtitle'] = event.title
h['proposalslink'] = Rails.application.routes.url_helpers.conference_proposal_url(
h['proposalslink'] = Rails.application.routes.url_helpers.new_conference_proposal_url(
conference.short_title, event, host: CONFIG['url_for_emails'])
end
h