Browse Source

Set location title to link text on the schedule (#263)

* Added optional text attribute to location link

* Set location title to link text on the schedule
development
Godwin 7 years ago
committed by GitHub
parent
commit
5f2add7f64
  1. 8
      app/helpers/geocoder_helper.rb
  2. 2
      app/views/conference_administration/_schedule.html.haml

8
app/helpers/geocoder_helper.rb

@ -84,9 +84,13 @@ module GeocoderHelper
return hash.length > 1 ? _("geography.formats.#{hash.keys.join('_')}", locale: locale, vars: hash) : hash.values.first
end
def location_link(location)
def location_link(location, text = nil)
return '' unless location.present?
address = if location.is_a?(Location)
address = if text is_a?(Symbol)
location.send(text)
elsif location.is_a?(String)
text
elsif location.is_a?(Location)
location.street
else
location.address

2
app/views/conference_administration/_schedule.html.haml

@ -15,7 +15,7 @@
%tr
%th.corner
- data[:locations].each do |id, location|
%th.location-header=location.is_a?(Symbol) ? '' : location_link(location)
%th.location-header=location.is_a?(Symbol) ? '' : location_link(location, :title)
%tbody
- data[:times].each do |time, time_data|
%tr{class: "row-type-#{time_data[:type] || 'nil'}"}

Loading…
Cancel
Save