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

Merge pull request #836 from davidsf/fix_email_send

Browse source 
Fix send emails because missing event program relation.
This commit is contained in:
Christian Bruckmayer 2016-03-18 11:18:59 -06:00
commit 3ad009658d
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/models/email_settings.rb
View file

@ -38,14 +38,14 @@ class EmailSettings < ActiveRecord::Base
if event
h['eventtitle'] = event.title
h['proposalslink'] = Rails.application.routes.url_helpers.conference_proposal_index_url(
h['proposalslink'] = Rails.application.routes.url_helpers.conference_program_proposal_index_url(
conference.short_title, host: CONFIG['url_for_emails'])
end
h
end
def generate_event_mail(event, event_template)
values = get_values(event.conference, event.submitter, event)
values = get_values(event.program.conference, event.submitter, event)
parse_template(event_template, values)
end