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

updated rails to 4.2.4

Browse source
This commit is contained in:
raluka 2015-09-17 12:12:51 +02:00
parent 37697517df
commit 42e8bb11ea
55 changed files with 766 additions and 365 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/models/email_settings.rb
View file

@ -49,7 +49,7 @@ class EmailSettings < ActiveRecord::Base
h['registration_end_date'] = conference.registration_period.end_date
end
if !event.nil?
if event
h['eventtitle'] = event.title
h['proposalslink'] = Rails.application.routes.url_helpers.conference_proposal_index_url(
conference.short_title, host: CONFIG['url_for_emails'])
@ -67,6 +67,8 @@ class EmailSettings < ActiveRecord::Base
parse_template(conf_update_template, values)
end
private
def parse_template(text, values)
values.each do |key, value|
if value.kind_of?(Date)