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

Merge 27fc0acbf8 into 6755328c4c

Browse source
This commit is contained in:
Christian Bruckmayer 2014-08-13 09:41:35 +00:00
commit f86added23
24 changed files with 388 additions and 116 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/models/email_settings.rb
View file

@ -19,8 +19,8 @@ class EmailSettings < ActiveRecord::Base
'conference' => conference.title,
'conference_start_date' => conference.start_date,
'conference_end_date' => conference.end_date,
'registration_start_date' => conference.registration_start_date,
'registration_end_date' => conference.registration_end_date,
'registration_start_date' => conference.audience.registration_start_date,
'registration_end_date' => conference.audience.registration_end_date,
'venue' => conference.venue.name,
'venue_address' => conference.venue.address,
'registrationlink' => Rails.application.routes.url_helpers.register_conference_url(