Don't set venue related values without a venue

This commit is contained in:
Sasi Olin 2021-03-07 10:16:05 +01:00
parent 6b57c0be05
commit 56838b6eb0
2 changed files with 17 additions and 13 deletions

View file

@ -91,6 +91,7 @@ class ConferencesController < ApplicationController
e.uid = conf.guid e.uid = conf.guid
e.url = conference_url(conf.short_title) e.url = conference_url(conf.short_title)
v = conf.venue v = conf.venue
if v
e.geo = v.latitude, v.longitude if v.latitude && v.longitude e.geo = v.latitude, v.longitude if v.latitude && v.longitude
location = '' location = ''
location += "#{v.street}, " if v.street location += "#{v.street}, " if v.street
@ -100,6 +101,7 @@ class ConferencesController < ApplicationController
end end
end end
end end
end
calendar.publish calendar.publish
render inline: calendar.to_ical render inline: calendar.to_ical
end end

View file

@ -36,6 +36,7 @@ module ConferenceHelper
e.uid = proposal.guid e.uid = proposal.guid
e.url = conference_program_proposal_url(conference.short_title, proposal.id) e.url = conference_program_proposal_url(conference.short_title, proposal.id)
v = conference.venue v = conference.venue
if v
e.geo = v.latitude, v.longitude if v.latitude && v.longitude e.geo = v.latitude, v.longitude if v.latitude && v.longitude
location = '' location = ''
location += "#{proposal.room.name} - " if proposal.room.name location += "#{proposal.room.name} - " if proposal.room.name
@ -43,6 +44,7 @@ module ConferenceHelper
location += "#{v.postalcode} #{v.city}, " if v.postalcode && v.city location += "#{v.postalcode} #{v.city}, " if v.postalcode && v.city
location += "#{v.country_name}, " if v.country_name location += "#{v.country_name}, " if v.country_name
e.location = location e.location = location
end
e.categories = conference.title, "Difficulty: #{proposal.difficulty_level.title}", "Track: #{proposal.track.name}" e.categories = conference.title, "Difficulty: #{proposal.difficulty_level.title}", "Track: #{proposal.track.name}"
end end
end end